From d34d7cea5901cc1f65a895b5b916e860495835c324a5363dabb3c575e0a25fb6 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 21 Jun 2017 08:49:56 +0000 Subject: [PATCH] Accepting request 505211 from home:adamm:branches:science - rstat_test.patch - Fix rstat test on PPC platform - re-enable multi-job support in unit tests (check make target) OBS-URL: https://build.opensuse.org/request/show/505211 OBS-URL: https://build.opensuse.org/package/show/science/gsl?expand=0&rev=10 --- gsl.changes | 6 ++++++ gsl.spec | 4 +++- rstat_test.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 rstat_test.patch diff --git a/gsl.changes b/gsl.changes index fc14823..7dece1a 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 20 08:26:18 UTC 2017 - adam.majer@suse.de + +- rstat_test.patch - Fix rstat test on PPC platform +- re-enable multi-job support in unit tests (check make target) + ------------------------------------------------------------------- Mon Jun 19 14:11:18 UTC 2017 - adam.majer@suse.de diff --git a/gsl.spec b/gsl.spec index 3f0d6c1..3f65694 100644 --- a/gsl.spec +++ b/gsl.spec @@ -29,6 +29,7 @@ Source0: https://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz Source1: https://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.gz.sig Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=gsl&download=1#/%{name}.keyring Patch0: gsl-1.6-initvars.diff +Patch1: rstat_test.patch Patch5: gsl-wrap.diff Patch6: gsl-qawc-test-x86-precision.diff Patch7: gsl-disable-fma.patch @@ -142,6 +143,7 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch5 -p1 %patch6 %patch7 -p1 @@ -158,7 +160,7 @@ export CFLAGS="%{optflags}" make %{?_smp_mflags} %check -make check --jobs 1 || ( find -name \*.log -print -exec cat {} \; ; exit 1 ) +make %{?_smp_mflags} check || ( find -name \*.log -print -exec cat {} \; ; exit 1 ) %install %make_install diff --git a/rstat_test.patch b/rstat_test.patch new file mode 100644 index 0000000..5c0d3b1 --- /dev/null +++ b/rstat_test.patch @@ -0,0 +1,29 @@ +Author: Patrick Alken +Date: Tue Jun 20 10:27:06 CEST 2017 + +Index: gsl-2.4/rstat/test.c +=================================================================== +--- gsl-2.4.orig/rstat/test.c ++++ gsl-2.4/rstat/test.c +@@ -127,7 +127,7 @@ main() + { + const size_t N = 2000000; + double *data = random_data(N, r); +- double data2[] = { 4.0, 7.0, 13.0, 16.0 }; ++ double data2[] = { 4.0, 7.0, 13.0, 16.0, -5.0 }; + size_t i; + + test_basic(2, data, tol1); +@@ -139,10 +139,10 @@ main() + test_basic(1500000, data, tol1); + test_basic(2000000, data, tol1); + +- for (i = 0; i < 4; ++i) ++ for (i = 0; i < 5; ++i) + data2[i] += 1.0e9; + +- test_basic(4, data2, tol1); ++ test_basic(5, data2, tol1); + + free(data); + }