From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UKXPCPKa6WJzggEAbAwnHQ (envelope-from ) for ; Tue, 02 Aug 2022 23:45:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KKvdCPKa6WKzLgEA9RJhRA (envelope-from ) for ; Tue, 02 Aug 2022 23:45:22 +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 F1AAD8F17 for ; Tue, 2 Aug 2022 23:45:21 +0200 (CEST) Received: from localhost ([::1]:58554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oIzhY-00022J-VR for larch@yhetil.org; Tue, 02 Aug 2022 17:45:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIzhI-0001wO-VN for guix-patches@gnu.org; Tue, 02 Aug 2022 17:45:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55560) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIzhI-0006QO-MO for guix-patches@gnu.org; Tue, 02 Aug 2022 17:45:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oIzhI-0003A2-JA for guix-patches@gnu.org; Tue, 02 Aug 2022 17:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56898] [PATCH 05/13] style: Adjust test to not emit blank lines. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Aug 2022 21:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56898@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 56898-submit@debbugs.gnu.org id=B56898.165947668412016 (code B ref 56898); Tue, 02 Aug 2022 21:45:04 +0000 Received: (at 56898) by debbugs.gnu.org; 2 Aug 2022 21:44:44 +0000 Received: from localhost ([127.0.0.1]:45291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIzgy-00037e-IU for submit@debbugs.gnu.org; Tue, 02 Aug 2022 17:44:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIzgq-00035S-QT for 56898@debbugs.gnu.org; Tue, 02 Aug 2022 17:44:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oIzgk-00069e-EI; Tue, 02 Aug 2022 17:44:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KfJIRIoRnbWzjUZg0rsRaWP15mI7T4TDJvTgqiEv1UM=; b=ddMXS5UxvZKF43EyHgpN 0n5Gvut04hOjl4PtYnL/aMC6ykd0iVNeQ7W83iQXi4peqi4c0OoqpFdBjdT5OLYBZ+UffvDwlZMAc kcYcbcIp7K6ieKEZFBefLOR9Ft3R8K6i/caSHJHWFIF3EHlv4k4/Df6Lx6hnYB09LzrVx7+B3SxUT HGmyt0Y0P30c/Pw90tjXgCEp9lrYZ1XTzEl0tid1jK6VYncWy9OR4VN1mEQTtbnXYJ2wkEaYmVVXG bbY+A8ULA7ll9D38ci0MiZoHsddn2Qv4izhRcpTjLd4Ef3F+0op+itPZGEUQ80qy4LRB4d9Ncpqwv 7jUHb7YK6ZxZAA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:52235 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oIzgk-0006W4-1u; Tue, 02 Aug 2022 17:44:30 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 2 Aug 2022 23:44:11 +0200 Message-Id: <20220802214419.19013-5-ludo@gnu.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220802214419.19013-1-ludo@gnu.org> References: <20220802214419.19013-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659476722; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=KfJIRIoRnbWzjUZg0rsRaWP15mI7T4TDJvTgqiEv1UM=; b=lB54O2ZP6LN5/8nPOIYAgWoPTOqqXXbwOdQaSQWMYK8y04g7Rr9GxQ14lKohDiFMjtqGFK 6gi1KzKwSDOVvtddshEqrDBGhH5CdS3ga1YZ7DxcmdPiGX1HOvQ+ldUenU6gYaPLo6jgky kEFQe+DJblcC7afNZqtdmBiirF5QHKeShYecPbso5wflm66gvIbFJn5ZknL2d8ib6XaiTc Rv3IX3tnnVzAHMFZkYWHpFpP2GLAfDyMdh2gJQs2bfXd4nF0B/i1AzusdbZdYfk8jvFnhA yZaFn6PceAkxXIhMnZoE8ffhrZPEgtqoFqMetAJXoWUHElOBtIgT95py+Biy6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659476722; a=rsa-sha256; cv=none; b=c9nyiZQbj3pcTWVitjgzaqTEZI9n3GB6JKMT6t/dfBVxbaR9pMF8uH7R+FeEQdIcB+Jzu9 5+je5PnvK3tsjyGr2ZsULeAnTK309m7uXvv+P23DwGKVLSefYeXUG4vjooHn8fkG2+Qdc0 Cgi/nHFHrp5RxcWJYYzNvFx+tI7jN33KWbPIIRvC5aiUOCHEIbOVb4ojERETNVgXgAkRzm +B7tAZxOSPTlRcyAyRM1fVC68gf5NYyWm9kXUXaXyzZJRZYEEbMGMoNxnkkAk2WYw7Nt+P tmbeAhqYZtjglQJ80reSzh4Tm9udKxiucio9ErXBE+DHgQrbQwea5MZ5DxShIg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ddMXS5Ux; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -2.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=ddMXS5Ux; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: F1AAD8F17 X-Spam-Score: -2.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: eQXAMZvF5BGj Previously this test would produce a file containing blank lines between inputs. * tests/style.scm ("input labels, modify-inputs and margin comment"): Remove trailing newlines in replacement strings of 'substitute*' expression. --- tests/style.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/style.scm b/tests/style.scm index 4ac5ae7c09..6aab2c3785 100644 --- a/tests/style.scm +++ b/tests/style.scm @@ -355,9 +355,9 @@ (define file (substitute* file ((",gmp\\)(.*)$" _ rest) - (string-append ",gmp) ;margin comment\n" rest)) + (string-append ",gmp) ;margin comment" rest)) ((",acl\\)(.*)$" _ rest) - (string-append ",acl) ;another one\n" rest))) + (string-append ",acl) ;another one" rest))) (system* "guix" "style" "-L" directory "-S" "inputs" "my-coreutils") -- 2.37.1