[bug#46440] [PATCH core-updates] gnu: findutils-boot0: Enable tests on arm.

[Pierre Langlois]

Hello Guix!

I noticed the recent rust changes on core-updates, so I was eager to try
and get rust working on aarch64 again, but I noticed I couldn't
bootstrap because the pthread tests from findutils-boot0 were failing.

I was just about to send a patch for that and then saw we had disabled
the tests all together. So, here's an updated patch that re-enables them
again, but disable only pthread tests.

Let me know what you think of this patch, I've tested it on aarch64 and
currently building rust 1.29, but I wasn't able to test it on x86, I'm
getting the following failure:

--8<---------------cut here---------------start------------->8---
starting phase `compress-documentation'                                         
                                                                               
compressing documentation in 
'/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man' 
with "gzip" and flags ("--best" "--no-name")
sterror: unknown error: 
/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/find.1
    
sterror: unknown error: 
/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/locate.1
   
sterror: unknown error: 
/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/updatedb.1
 
sterror: unknown error: 
/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/xargs.1
           
sterror: unknown error: 
/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man5/locatedb.5
error: in phase 'compress-documentation': uncaught exception:
srfi-34 #<condition &invoke-error [program: "gzip" arguments: ("--best" 
"--no-name" 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/find.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/locate.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/updatedb.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/xargs.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man5/locatedb.5")
 exit-status: 1 term-signal: #f stop-signal: #f] 1222080> 
phase `compress-documentation' failed after 0.0 seconds
command "gzip" "--best" "--no-name" 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/find.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/locate.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/updatedb.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man1/xargs.1"
 
"/gnu/store/fl4xmk5pln6lw81ixjk3w24hhdn1zi26-findutils-boot0-4.8.0/share/man/man5/locatedb.5"
 failed with status 1                       
builder for 
`/gnu/store/g64zjdljpk4wawimf44v7ysgf23ywg30-findutils-boot0-4.8.0.drv' failed 
with exit code 1
build of /gnu/store/g64zjdljpk4wawimf44v7ysgf23ywg30-findutils-boot0-4.8.0.drv 
failed
View build log at 
'/var/log/guix/drvs/g6/4zjdljpk4wawimf44v7ysgf23ywg30-findutils-boot0-4.8.0.drv.bz2'.
--8<---------------cut here---------------end--------------->8---

I'm a bit confused what's going on, anybody has a clue?

By the way, I'm glad we no longer have to pass all the tests for every
stage of the rust bootstrap, getting this working on different platform
was quite tedious :-).

Thanks,
Pierre

signature.asc
Description: PGP signature

>From 6dffcb4a99909830cf0cecd2c9882867b379eca4 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Sat, 6 Feb 2021 21:23:56 +0000
Subject: [PATCH] gnu: findutils-boot0: Enable tests on arm.

* gnu/packages/commencement.scm (findutils-boot0)[arguments]: Enable tests.
Rename skip-fnmatch-test phase skip-tests.  Only disable test-fnmatch on
x86_64 and i686.  Disable pthread tests on other platforms.
---
 gnu/packages/commencement.scm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 890d57941f..ecb2307b05 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2490,8 +2491,6 @@ exec " gcc "/bin/" program
        ,@(%bootstrap-inputs+toolchain)))
     (arguments
      `(#:implicit-inputs? #f
-       ;; Ignore test failure in gnulib for armhf/aarch64.
-       #:tests? ,(not (target-arm?))
        #:guile ,%bootstrap-guile
 
        ;; The build system assumes we have done a mistake when time_t is 32-bit
@@ -2509,14 +2508,22 @@ exec " gcc "/bin/" program
               ,flags))
            ((#:phases phases '%standard-phases)
             `(modify-phases ,phases
-               (add-before 'check 'skip-fnmatch-test
+               (add-before 'check 'skip-tests
                  (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 ")))))))))))
+                   ,(match (%current-system)
+                     ;; 'test-fnmatch' fails when using glibc-mesboot@2.16, due
+                     ;; to incorrect handling of the [:alpha:] regexp character
+                     ;; class.  Ignore it.
+                     ((or "x86_64-linux" "i686-linux")
+                      '(substitute* "gnulib-tests/Makefile"
+                         (("^XFAIL_TESTS =")
+                          "XFAIL_TESTS = test-fnmatch ")))
+                     (_
+                      '(substitute* "gnulib-tests/Makefile"
+                         (("test-pthread\\$\\(EXEEXT\\)") "")
+                         (("test-pthread-thread\\$\\(EXEEXT\\)") "")
+                         (("test-pthread_sigmask1\\$\\(EXEEXT\\)") "")
+                         (("test-pthread_sigmask2\\$\\(EXEEXT\\)") 
"")))))))))))))
 
 (define file
   (package
-- 
2.30.0