From d520fdec3c7a11bc70ab83d0ebc6372389992d04 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 Oct 2022 01:25:56 +0200 Subject: gnu: findutils: Skip failing test on GNU/Hurd. * gnu/packages/base.scm (findutils)[arguments]: Add #:make-flags. * gnu/packages/commencement.scm (findutils-boot0)[arguments]: Likewise. --- gnu/packages/commencement.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 60b06c0901..2062e7c1dc 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2526,7 +2526,9 @@ (define findutils-boot0 (substitute* "gnulib-tests/Makefile" (("^XFAIL_TESTS =") "XFAIL_TESTS = test-fnmatch "))))) - '())))))))) + '()))) + ((#:make-flags flags ''()) + ''())))))) (define file (package -- cgit v1.2.3 From 2a152e1a42651eaa5ee07f7afae87b2cfe25f6e0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 28 Oct 2022 15:14:30 +0100 Subject: 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(-) (limited to 'gnu/packages/commencement.scm') 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 @@ (define-public diffutils "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 @@ (define diffutils-boot0 `(#: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 -- cgit v1.2.3