From ab2cc5cde16ec850c63fa55cc4ce82cf31683344 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 5 Oct 2016 14:52:47 +0200
Subject: gnu: gsl: Disable failing tests on i686.

* gnu/packages/patches/gsl-test-i686.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/maths.scm (gsl)[source](patches): New field.
---
 gnu/local.mk                             |  1 +
 gnu/packages/maths.scm                   | 16 ++++++++--------
 gnu/packages/patches/gsl-test-i686.patch | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 gnu/packages/patches/gsl-test-i686.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 66d6bcb21c..a609bf697c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -556,6 +556,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/grub-CVE-2015-8370.patch			\
   %D%/packages/patches/grub-gets-undeclared.patch		\
   %D%/packages/patches/grub-freetype.patch			\
+  %D%/packages/patches/gsl-test-i686.patch			\
   %D%/packages/patches/guile-1.8-cpp-4.5.patch			\
   %D%/packages/patches/guile-arm-fixes.patch			\
   %D%/packages/patches/guile-default-utf8.patch			\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8f480a66b2..a00b38a7e4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -186,14 +186,14 @@ (define-public gsl
   (package
     (name "gsl")
     (version "2.2.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/gsl/gsl-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "095hp01d8lkqdvv0p1k25kvbisgfdmvx1rzpyc2i8kl2n33kvlhk"))))
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/gsl/gsl-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "095hp01d8lkqdvv0p1k25kvbisgfdmvx1rzpyc2i8kl2n33kvlhk"))
+              (patches (search-patches "gsl-test-i686.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:parallel-tests? #f))
diff --git a/gnu/packages/patches/gsl-test-i686.patch b/gnu/packages/patches/gsl-test-i686.patch
new file mode 100644
index 0000000000..8828c08614
--- /dev/null
+++ b/gnu/packages/patches/gsl-test-i686.patch
@@ -0,0 +1,17 @@
+Work around a test failure due to a rounding issue on 32-bit
+platforms, as reported at:
+
+  https://lists.gnu.org/archive/html/bug-gsl/2016-10/msg00000.html
+
+--- gsl-2.2.1/linalg/test.c	2016-10-05 13:27:42.464059730 +0200
++++ gsl-2.2.1/linalg/test.c	2016-10-05 13:27:46.988095882 +0200
+@@ -4843,9 +4843,6 @@ main(void)
+   gsl_test(test_cholesky_decomp_unit(),  "Cholesky Decomposition [unit triangular]");
+   gsl_test(test_cholesky_solve(),        "Cholesky Solve");
+ 
+-  gsl_test(test_cholesky_decomp(r),      "Cholesky Decomposition");
+-  gsl_test(test_cholesky_invert(r),      "Cholesky Inverse");
+-  gsl_test(test_pcholesky_decomp(r),     "Pivoted Cholesky Decomposition");
+   gsl_test(test_pcholesky_solve(r),      "Pivoted Cholesky Solve");
+   gsl_test(test_pcholesky_invert(r),     "Pivoted Cholesky Inverse");
+   gsl_test(test_mcholesky_decomp(r),     "Modified Cholesky Decomposition");
-- 
cgit v1.2.3