From patchwork Sun Aug 27 09:41:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: guix--- via Guix-patches via X-Patchwork-Id: 53247 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A63A27BBE2; Sun, 27 Aug 2023 10:42:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8255127BBEA for ; Sun, 27 Aug 2023 10:42:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaCHS-0007i3-KQ; Sun, 27 Aug 2023 05:42:02 -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 1qaCHN-0007h7-KF for guix-patches@gnu.org; Sun, 27 Aug 2023 05:41:57 -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 1qaCHN-0000eU-CH for guix-patches@gnu.org; Sun, 27 Aug 2023 05:41:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qaCHS-0005YR-LF for guix-patches@gnu.org; Sun, 27 Aug 2023 05:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65561] [PATCH 1/2] gnu: cssc: Fix tests. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Aug 2023 09:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65561 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65561@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169312930621311 (code B ref -1); Sun, 27 Aug 2023 09:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Aug 2023 09:41:46 +0000 Received: from localhost ([127.0.0.1]:44176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaCHC-0005Xe-6w for submit@debbugs.gnu.org; Sun, 27 Aug 2023 05:41:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaCH9-0005XP-Jb for submit@debbugs.gnu.org; Sun, 27 Aug 2023 05:41:45 -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 1qaCGw-0007DT-1P for guix-patches@gnu.org; Sun, 27 Aug 2023 05:41:31 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qaCGq-0000UV-Ry for guix-patches@gnu.org; Sun, 27 Aug 2023 05:41:28 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 9266238A0136; Sun, 27 Aug 2023 09:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693129282; bh=wjdoS3S8e3caTBsRg8xaQ/UD9A64v9Nmr5N0Qt2CQ0Q=; h=From:To:Cc:Subject:Date:From; b=N5LXMJTkyZ16t1zls/hQeu7exAo6503N7nZDv8rhM6C9ARgRtNXHWA0zAkZ3wWquy 66Vhd3240ry5c71+0zmnDQdVJHJceTmCKS78/Fu64rCIXWUj+jlq6wRFu0SvuX0U7H tM/jYCDvHfeYKrvgLFPQpg5Oig6+2tanBS5sQFS3JrD8ytTGhEarITeeFfUciOAgMc Nxs5C43LK+4NABdva6Ai8NSfFQLPJfdVxlwyX1MZScuc5JfklSrHGfMes//rrxAypI QKudGf7AEVJu6L7dj1IB2STb43FIvObsxY39v8Y8RXz3SDdsXpbVLqNiXvDR4j2aea DIPjWZt/NgSC/SmuVYd8XbskfPcusJkyZx5CkDh4qNkZyVWdSOKw9YigzIrG/UUjmU dszMPmbEYe93qMeLgBtL4NRZDX+8Z+80wKoBgwaNBlYe2v97qE4VVBNb1p0AHwcYRV OGNie8j4GdlQO9Omj14nnIz6kegoDhaLg9Ll5253/QgISQQG5Gx3RuWvuldL5lIJQh +eWZKOrYz/7J4Sq4oEEU4YvR82SqYbmXg80GGRo2Wzuzs5GFsIC5hQ5k22OUQ+1nDU VaIukdqMHg3bDz3Kc9NByP043b74iWTRGab5WhOzFdVtocvMPt+W9e3zc7xnuSehDB rEG9SmC9AzAtFkNQ5GLpjleo= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id wCawcF-0BHC4; Sun, 27 Aug 2023 09:41:19 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 27 Aug 2023 09:41:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a05abdbb; Sun, 27 Aug 2023 09:41:40 +0000 (UTC) Date: Sun, 27 Aug 2023 17:41:31 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: guix--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/version-control.scm (cssc)[arguments]: Replace egrep with grep -E in the precheck phase. --- gnu/packages/version-control.scm | 9 +++++++++ 1 file changed, 9 insertions(+) base-commit: 5856e185a3d4f47e27dfd064a231b3a1d44a6494 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 699a091642..1ca3dc9a53 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2377,6 +2377,15 @@ (define-public cssc (substitute* "tests/prt/all-512.sh" (("/bin/sh") (which "sh"))) + (for-each + (lambda (file) + (substitute* file (("egrep") "grep -E"))) + '("tests/common/test-common" + "tests/admin/comment.sh" + "tests/cdc/2comment.sh" + "tests/cdc/4order.sh" + "tests/get/subst.sh")) + ;; XXX: This test has no hope of passing until there is a "nogroup" ;; entry (or at least some group to which the guix builder does ;; not belong) in the /etc/group file of the build environment.