42/92: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd.

[guix-commits]

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

commit 0b59dc61cc108b3a97f18d43fbc105f429b23686
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Jun 3 08:47:34 2023 +0200

    gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd.
    
    * gnu/packages/base.scm (diffutils)[arguments]: When building natively on 
the
    Hurd, Move "large-subopt" test from #:make-flags' XFAIL_TESTS to a new
    'skip-tests' phase.  Remove #:make-flags for the Hurd, as "test-perror2" now
    passes.
---
 gnu/packages/base.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index c2dd156280..4ae1ba7a70 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -304,9 +304,15 @@ differences.")
             (patches (search-patches 
"diffutils-fix-signal-processing.patch"))))
    (build-system gnu-build-system)
    (arguments
-    `(#:make-flags ,(if (target-hurd?)
-                        ''("XFAIL_TESTS=test-perror2 large-subopt")
-                        ''())))
+    (list
+     #:phases (if (system-hurd?)
+                  #~(modify-phases %standard-phases
+                      (add-after 'unpack 'skip-tests
+                        (lambda _
+                          (substitute* "tests/large-subopt"
+                            (("^#!.*" all)
+                             (string-append all "exit 77;\n"))))))
+                  #~%standard-phases)))
    (native-inputs (list perl))
    (synopsis "Comparing and merging files")
    (description