branch core-updates updated: gnu: findutils-boot0: Really disable 'test-fnmatch' on i686-linux.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new fb40ec8  gnu: findutils-boot0: Really disable 'test-fnmatch' on 
i686-linux.
fb40ec8 is described below

commit fb40ec8aab105706a14b0b2299f38a8fd3e62377
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 2 11:47:17 2021 +0200

    gnu: findutils-boot0: Really disable 'test-fnmatch' on i686-linux.
    
    Commit f08b070019a3c1697bb0b4a783dcd4f31243715a intended to skip
    'test-fnmatch' on both x86_64-linux and i686-linux but it ended up
    skipping it on x86_64-linux only.
    
    * gnu/packages/commencement.scm (findutils-boot0)[arguments]: Use
    'member' to test whether (%current-system) is "x86_64-linux" or
    "i686-linux".
---
 gnu/packages/commencement.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1ae37d7..9e8bbf9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2516,14 +2516,14 @@ exec " gcc "/bin/" program
               ;; '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 ")))))
-                  '()))))))))
+               ,@(if (member (%current-system)
+                             '("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