From 6dffcb4a99909830cf0cecd2c9882867b379eca4 Mon Sep 17 00:00:00 2001 From: Pierre Langlois 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 ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Pierre Langlois ;;; ;;; 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