From f08b070019a3c1697bb0b4a783dcd4f31243715a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 10:47:44 +0200 Subject: [PATCH] gnu: findutils-boot0: Fix test suite on some systems. This is a follow-up to 3a0c7e7d1e9b4e0053f3dfa266c69bcc5e7ac61e. * gnu/packages/commencement.scm (findutils-boot0)[arguments]: Only add custom 'skip-fnmatch-test phase on x86_64-linux and i686-linux. --- gnu/packages/commencement.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index f6bfc27843..7c39a84008 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2512,14 +2512,17 @@ exec " gcc "/bin/" program ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (add-before 'check 'skip-fnmatch-test - (lambda _ - ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due - ;; to incorrect handling of the [:alpha:] regexp character - ;; class. Ignore it. - (substitute* "gnulib-tests/Makefile" - (("^XFAIL_TESTS =") - "XFAIL_TESTS = test-fnmatch "))))))))))) + ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due + ;; to incorrect handling of the [:alpha:] regexp character + ;; class. Ignore it. + ,@(if (string=? (%current-system) + (or "x86_64-linux" "i686-linux")) + '((add-before 'check 'skip-fnmatch-test + (lambda _ + (substitute* "gnulib-tests/Makefile" + (("^XFAIL_TESTS =") + "XFAIL_TESTS = test-fnmatch "))))) + '())))))))) (define file (package