diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-10-28 15:14:30 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-10-28 15:16:54 +0100 |
| commit | 2a152e1a42651eaa5ee07f7afae87b2cfe25f6e0 (patch) | |
| tree | 380d53b9a8c076475d33062f783d0cb22fed8ee7 /gnu/packages | |
| parent | fe20121dc7b19d1804acc086707fa0c9463d3127 (diff) | |
| download | guix-2a152e1a42651eaa5ee07f7afae87b2cfe25f6e0.tar.gz | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/base.scm | 4 | ||||
| -rw-r--r-- | 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 |