From patchwork Tue Jul 18 14:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51814 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 271F927BBEC; Tue, 18 Jul 2023 15:44:00 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 1C26127BBF1 for ; Tue, 18 Jul 2023 15:43:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltz-0007kY-Oq; Tue, 18 Jul 2023 10:42:11 -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 1qLltx-0007gi-Ue for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -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 1qLltw-0000vc-UE for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltw-0006eX-Kk; Tue, 18 Jul 2023 10:42:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 22/43] gnu: procps: Skip linux-version test for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Cc: Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969130125372 (code B ref 64711); Tue, 18 Jul 2023 14:42:08 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:41 +0000 Received: from localhost ([127.0.0.1]:53802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltV-0006ay-5s for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltS-0006aD-Fi for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLltN-0000kJ-8g; Tue, 18 Jul 2023 10:41:33 -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=9grFm2qMKZn2ZLDUh/Hz74jZHUpiOOPWB2JnZc2jvYs=; b=evLgI7C1miC+zkDv8ChL aJe1blE3WfwMe9CAzDnNfcWztZTRokw8z17RwpCwOaAusi74i9Y6rBNejrsV2BngJIQ05+HkLYzAR wAsaScpbZglNg1E0q3Lu34uRZ/kLJXJvbveSCF2PvVlst2gzs3HUbBeZkLQYJDSw2Dn5Hqx5qkfpz bDshTivC5U1ZKH9GdVDCVKrlzMS05aF6X+xKVXsP5SukqBkkKNSLLFdJ33EOUZY/HQO013253+ZQA VJ+gAzzPVoQkrPPwfZ1aZfrIed7Fw/3VusvMbnocb3Ed0a9dQJ6uS7zkRLQ2Aye4o6BzjWxELTFLv Ks1qfRKc37J0kw==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLltL-0004hp-Hv; Tue, 18 Jul 2023 10:41:33 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:15 +0200 Message-Id: <4731c0f34c71c0554e235fa8b47b74be18173347.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (procps)[arguments]: When building natively on the Hurd, add stage 'skip-tests'. --- gnu/packages/linux.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 39503de6ff..190c28cb60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Chris Marusich ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2020 John Soo ;;; Copyright © 2020, 2022 Michael Rohleder @@ -2390,7 +2390,14 @@ (define-public procps (let* ((out #$output) (dup (append-map (cut find-files out <>) '("^kill" "^uptime")))) - (for-each delete-file dup))))))) + (for-each delete-file dup)))) + #$@(if (system-hurd?) + #~((add-after 'unpack 'skip-tests + (lambda _ + (substitute* "library/tests/test_version.c" + (("^int main\\(.*" all) + (string-append all "{\n exit (77);//")))))) + #~())))) (inputs (list ncurses)) (native-inputs (list pkg-config)) (home-page "https://gitlab.com/procps-ng/procps/")