guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

12/14: gnu: findutils-boot0: Fix test suite on some systems.


From: guix-commits
Subject: 12/14: gnu: findutils-boot0: Fix test suite on some systems.
Date: Mon, 15 Mar 2021 06:05:50 -0400 (EDT)

efraim pushed a commit to branch wip-ppc
in repository guix.

commit c7ab6ff07e081c08028e069999bd7602e8d9790c
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 9 10:47:44 2021 +0200

    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 e8ea822..97a2fce 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2509,14 +2509,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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]