From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0GZeBvyA4GTbSAAASxT56A (envelope-from ) for ; Sat, 19 Aug 2023 10:44:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kAkVBvyA4GRk7QAA9RJhRA (envelope-from ) for ; Sat, 19 Aug 2023 10:44:44 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CEFBF37396 for ; Sat, 19 Aug 2023 10:44:43 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=VCHEj8i2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692434683; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rZXtsSlb+BBb+aydZO95YzFQL+nfq28g/XQtoLjNY5Q=; b=XjmDDUamriyCm6jV60d2mA/eIT7zkNmYdryDnaVZmGX741qOQVi8fZYoGSXbDsD6IigIi/ xY1AHhTMRvOECJl5woZ5MqjKmIJQbze3S6kwjzahtn65D5S2vUrWsN7lv40SY9wbSLRUz1 tEBoiBuy3qP43CKnfsEw39xpS4zgshaZEja/j2X7lnlEGQF2ZjoorrA0FmgohCUGG+xZ2W pQ8lU/AMFA8Z4P+eVNZBScY87sbNr1KscDqiRnH0BUfkclrgI0lQT1DT8vcOmX3zb04NRm W2lDsu6OufB4947FGRFRQkI1Fv0Usv/jwwuynb7vhvG3QLRKM2XyeofjlScxJA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=VCHEj8i2; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692434683; a=rsa-sha256; cv=none; b=aFQf5phySMw1Z1oKjIaEFVnErIAEEKSDY2w8gKYv1Lo6AwOuH94Ny9LBGLZD3mY0aoa59d TBX7PBnYGYFSRVAwn2RXQYSDArNDurEEOxr3416Vje0arzXJXgVfBBf18rnTWg7zD394ON 2JAJuM6xbJ4W9uS7POHE9AdwKd7k2V3CNGDzuqkTWrQdf9GTH73zKUhzlaoMbUQI1/UlEh 8EKjshEchlpM1qjghN8Lp4qQ+hohGQ7s8BIfOSjBH0PH3XSDODosOQzRfVwaqaYh3MD5WJ 5WfKit4LFebceougunjq3X7DQFj0034yBkR81oaO7yO53R/NJpE3OUOIj4lLbA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXHZ1-0000jc-AX; Sat, 19 Aug 2023 04:44:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXHYw-0000bq-Jq for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXHYw-0000es-CD for guix-patches@gnu.org; Sat, 19 Aug 2023 04:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXHYx-0005Al-6u; Sat, 19 Aug 2023 04:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65376] [PATCH emacs-team 4/7] guix: emacs-utils: Add ert-number-tests. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 19 Aug 2023 08:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65376 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65376@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by 65376-submit@debbugs.gnu.org id=B65376.169243459819758 (code B ref 65376); Sat, 19 Aug 2023 08:44:03 +0000 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:18 +0000 Received: from localhost ([127.0.0.1]:49402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYD-00058Q-Qp for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:18 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:46204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY9-00057O-Gb for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:14 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-98377c5d53eso208583566b.0 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434587; x=1693039387; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=rZXtsSlb+BBb+aydZO95YzFQL+nfq28g/XQtoLjNY5Q=; b=VCHEj8i2fJd5UmzTgVHUySmXzVUAx3g0BayP615CqvEuW6pp6wq+4s2oq2hQ9VM1Yw 2og4GjP5/CPTNiz9sP9iA/c5tc6Oj8C/g0vOuprZK2xUM4uWsoOr8LAXojDQMwigYVpD 82GxRJg12A3dWaolTc0uKepg1WU6IzUWgUckqg7lYet1i/KeELdhdo5RyyLeFJH/neeE GP9BcePvGBM532G376kn6THgOlmyDjDhT5DT5ssFDDS6R8jSAp4/2JNffKbgHgOqng3D Q9rzkd+F5RSqxlPnO4FxLIx2BsAsFfUZa++vHzegWIrXcZQrV+BVNYr3mnH0YJbZTd4N 1ZNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434587; x=1693039387; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rZXtsSlb+BBb+aydZO95YzFQL+nfq28g/XQtoLjNY5Q=; b=DiH0lNX8o6jz/VQhgrgAxgIDuP9wzwWV5Q+R49SY3KlImC02SooVKZEDf45603s6ak AnOLU+Ezx1l3VMNfl5lGBkLyhjvQH+5UMuI4yhHTEOE60y8GMxPlvJuISk9GzLpUhay7 s1y788XteayRxX3T8YqS0f+smiGHzhKlJghynCfHCHXa5JNOI+PE/hPKwjhlpI7Cj2Vg NL8Uo8VACLtppTjCHvyGUX21VPCvsXQadfqC9UsNeiANDsyWIRqKBebS9WC07ByGVZJC TPLEOQy6TZGMTbJi2JnAKYr2PumqLGR5buIR56pqDVnOuWP/Bd4iKELsXY8CAw/am++h H6qA== X-Gm-Message-State: AOJu0Yz+UOX5SwnQNlLQPoeO7o5U6901OvkZr99oC6s1kFUIGa/FVYeg 9B+jEgCRTNj/L/KBCB9UL2zeZQksrcC9vw== X-Google-Smtp-Source: AGHT+IHNS0a9p5lIclBBlgcfVUwVdwFddSg6oGH8tSXInLL67JRsFCuDoeIRJBPMEEtlHxNvu2e8BQ== X-Received: by 2002:a17:906:7696:b0:99b:4956:e4e3 with SMTP id o22-20020a170906769600b0099b4956e4e3mr1051609ejm.8.1692434586924; Sat, 19 Aug 2023 01:43:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.05 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:06 -0700 (PDT) Message-ID: <50b2db40ea03d8b3c78b3a774e057ebab0f98790.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:37:20 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: 2.81 X-Spam-Score: 2.81 X-Migadu-Queue-Id: CEFBF37396 X-TUID: AYXF19wvugWF * guix/build/utils.scm (ert-number-tests): New variable. --- guix/build/emacs-utils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 850b1f5f2a..ac3dac57d1 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -40,6 +40,7 @@ (define-module (guix build emacs-utils) emacs-byte-compile-directory emacs-compile-directory emacs-header-parse + ert-number-tests as-display emacs-substitute-sexps @@ -183,6 +184,19 @@ (define-syntax replacement-helper (insert " ") (insert ,(format #f "~s" replacement)))))) +(define (ert-number-tests file test-name) + "Add a numerically increasing suffix to tests of the same name. +This fixes test errors of the pattern \"Test TEST_NAME redefined\"." + (emacs-batch-edit-file file + `(let ((i 0)) + (while (re-search-forward ,(string-append "ert-deftest " test-name) + nil t) + (goto-char (match-beginning 0)) + (kill-region (match-beginning 0) (match-end 0)) + (insert (format "ert-deftest %s-%d" ,test-name i)) + (setq i (+ i 1))) + (basic-save-buffer)))) + (define-syntax emacs-substitute-sexps (syntax-rules () "Substitute the S-expression immediately following the first occurrence of -- 2.41.0