01/04: gnu: GSL: Disable failing tests on i686-linux and aarch64-linux.

[guix-commits]

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

commit c745b6f62c9c70f0ac286c1540cbee240ebac59f
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Apr 3 15:53:10 2020 +0200

    gnu: GSL: Disable failing tests on i686-linux and aarch64-linux.
    
    This follows up commit 7ad3c81240b366b99f29c4ac5f7c42173c91f38a, which 
enabled
    tests that were previously disabled on i686, and takes into account new 
tests
    with similar issues.  While at it, selectively disable tests on aarch64
    instead of disabling all tests.
    
    * gnu/packages/maths.scm (gsl)[arguments]: On i686 and aarch64, add 
#:phases.
---
 gnu/packages/maths.scm | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4ff2189..05cea47 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -26,7 +26,7 @@
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <address@hidden>
 ;;; Copyright © 2018 Nadya Voronova <address@hidden>
 ;;; Copyright © 2018 Adam Massmann <address@hidden>
-;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2018, 2020 Marius Bakke <address@hidden>
 ;;; Copyright © 2018 Eric Brown <address@hidden>
 ;;; Copyright © 2018 Julien Lepiller <address@hidden>
 ;;; Copyright © 2018 Amin Bandali <address@hidden>
@@ -388,12 +388,35 @@ semiconductors.")
                 "1a460zj9xmbgvcymkdhqh313c4l29mn9cffbi5vf33x3qygk70mp"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; Currently there are numerous tests that fail on "exotic"
-       ;; architectures such as aarch64 and ppc64le.
-       ,@(if (string-prefix? "aarch64-linux"
-                             (or (%current-target-system) (%current-system)))
-           '(#:tests? #f)
-           '())))
+     (let ((system (%current-system)))
+       (cond
+        ((string-prefix? "aarch64" system)
+         ;; Some sparse matrix tests are failing on AArch64:
+         ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00001.html
+         '(#:phases (modify-phases %standard-phases
+                      (add-before 'check 'disable-failing-tests
+                        (lambda _
+                          (substitute* "spmatrix/test.c"
+                            ((".*test_complex.*") "\n"))
+                          #t)))))
+        ((string-prefix? "i686" (%current-system))
+         ;; There are rounding issues with these tests on i686:
+         ;; https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html
+         ;; https://lists.gnu.org/archive/html/bug-gsl/2020-04/msg00000.html
+         '(#:phases (modify-phases %standard-phases
+                      (add-before 'check 'disable-failing-tests
+                        (lambda _
+                          (substitute* "linalg/test.c"
+                            ((".*gsl_test\\(test_LU_decomp.*") "\n")
+                            ((".*gsl_test\\(test_LUc_decomp.*") "\n")
+                            ((".*gsl_test\\(test_cholesky_decomp.*") "\n")
+                            ((".*gsl_test\\(test_COD_lssolve2.*") "\n"))
+                          (substitute* "spmatrix/test.c"
+                            ((".*test_all.*") "\n")
+                            ((".*test_float.*") "\n")
+                            ((".*test_complex.*") "\n"))
+                          #t)))))
+        (else '()))))
     (home-page "https://www.gnu.org/software/gsl/";)
     (synopsis "Numerical library for C and C++")
     (description