01/02: gnu: diffutils: Skip failing test on GNU/Hurd.

[guix-commits]

cbaines pushed a commit to branch master
in repository guix.

commit 2a152e1a42651eaa5ee07f7afae87b2cfe25f6e0
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Oct 28 15:14:30 2022 +0100

    gnu: diffutils: Skip failing test on GNU/Hurd.
    
    * gnu/packages/base.scm (diffutils)[arguments]: Add #:make-flags.
    * gnu/packages/commencement.scm (diffutils-boot0)[arguments]: Adjust to 
always
    use substitute-keyword-arguments.
---
 gnu/packages/base.scm         |  4 ++++
 gnu/packages/commencement.scm | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 6164dc6d38..3062274d41 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -283,6 +283,10 @@ differences.")
               "1v4g8gi0lgakqa7iix8s4fq7lq6l92vw3rjd9wfd2rhjng8xggd6"))
             (patches (search-patches 
"diffutils-fix-signal-processing.patch"))))
    (build-system gnu-build-system)
+   (arguments
+    `(#:make-flags ,(if (hurd-target?)
+                        ''("XFAIL_TESTS=test-perror2")
+                        ''())))
    (native-inputs (list perl))
    (synopsis "Comparing and merging files")
    (description
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2062e7c1dc..b4566b41cc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2475,15 +2475,15 @@ exec " gcc "/bin/" program
      `(#:tests? #f                            ; the test suite needs diffutils
        #:guile ,%bootstrap-guile
        #:implicit-inputs? #f
-       ,@(match (%current-system)
-           ((or "arm-linux" "aarch64-linux")
-            (substitute-keyword-arguments (package-arguments diffutils)
-              ((#:configure-flags flags ''())
+       ,@(substitute-keyword-arguments (package-arguments diffutils)
+           ((#:configure-flags flags ''())
+            (match (%current-system)
+              ((or "arm-linux" "aarch64-linux")
                ;; The generated config.status has some problems due to the
                ;; bootstrap environment.  Disable dependency tracking to work
                ;; around it.
-               `(cons "--disable-dependency-tracking" ,flags))))
-           (_ '()))))))
+               `(cons "--disable-dependency-tracking" ,flags))
+              (_ flags))))))))
 
 (define findutils-boot0
   (package