From 97677bbda07121887b22e12860499b6ad5fe0aa5 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Sat, 3 Jun 2023 08:47:34 +0200 Subject: 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 14479c4951..1fdfaf8a57 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -303,9 +303,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 -- cgit v1.2.3