guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

30/65: gnu: procps: Skip linux-version test for the Hurd.


From: guix-commits
Subject: 30/65: gnu: procps: Skip linux-version test for the Hurd.
Date: Fri, 14 Jul 2023 10:06:02 -0400 (EDT)

janneke pushed a commit to branch hurd-team
in repository guix.

commit 53c670ce230e1d1f2ab93ab3c5fa9314bb273079
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Jun 9 07:17:48 2023 +0200

    gnu: procps: Skip linux-version test for the Hurd.
    
    * 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 f548b7307d..1dcbce8732 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -42,7 +42,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
@@ -2356,7 +2356,14 @@ parameters.")
                    (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/";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]