From c30e951a488a3dc1ca01a64b6e1c91e3cbb393c9 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sat, 6 Jan 2018 17:45:39 +0100
Subject: [PATCH] re-enable running testsuite in %check

- reduce testsuite runtime per upstream recommendation
- disable testing under OpenMPI for now (rhbz#1512229)
---
 elpa.spec | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/elpa.spec b/elpa.spec
index 8747b57..357e107 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -8,7 +8,7 @@
 %global with_papi 1
 %endif
 
-%bcond_with check
+%bcond_without check
 
 %global sover 8
 
@@ -246,23 +246,28 @@ done
 echo ".so elpa2_print_kernels.1" > %{buildroot}%{_mandir}/man1/elpa2_print_kernels_openmp.1
 
 # testsuite takes:
-# 30 hours on aarch64 (all PASS)
-# 44 hours on armv7hl (all PASS)
-# 30 hours on i686    (serial/mpich PASS, openmpi hang)
-#  6 hours on ppc64le (18/50 FAIL for serial+openmp, 25/73 FAIL for mpich+openmp)
-#  8 hours on ppc64   (all PASS)
-# 11 hours on s390x   (25/50 FAIL for serial, 39/73 FAIL for mpi)
-# 16 hours on x86_64  (all PASS)
+#  1 hour  on aarch64 (all PASS)
+#  1 hour  on armv7hl (all PASS)
+#  1 hour  on i686    (serial/mpich PASS, OpenMPI disabled)
+#  1 hour  on ppc64le ( 9/50 FAIL for serial+openmp, 4/73 FAIL for mpich+openmp)
+#  1 hour  on ppc64   ( 1/50 FAIL for serial+openmp)
+#  1 hour  on s390x   (25/50 FAIL for serial, 39/73 FAIL for mpi)
+#  3 hours on x86_64  (all PASS)
 %if %{with check}
 %check
 . /etc/profile.d/modules.sh
 for s in '' _openmp ; do
+# openmpi tests get randomly stuck on i686 https://bugzilla.redhat.com/show_bug.cgi?id=1512229
+%ifnarch i686
   for mpi in '' mpich openmpi ; do
+%else
+  for mpi in '' mpich ; do
+%endif
     pushd ${s:-.}/${mpi:-serial}
     if [ -n "$mpi" ]; then
       module load mpi/${mpi}-%{_arch}
     fi
-    make check V=1 || cat ./test-suite.log
+    make check V=1 TEST_FLAGS="500 150 16" || cat ./test-suite.log
     if [ -n "$mpi" ]; then
       module unload mpi/${mpi}-%{_arch}
     fi
@@ -352,9 +357,11 @@ done
 - provide a man-link for openmp version of elpa2_print_kernels
 - execstack is now available everywhere
 - include and verify GPG signature
-- conditionalize running tests and disable by default as they take too long
+- conditionalize running tests and reduce testsuite runtime per upstream
+  recommendation
 - split out API documentation and headers into -common-devel subpackage
 - disable all non-generic kernels on non-x86_64 for now
+- disable testing under OpenMPI for now (rhbz#1512229)
 
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2015.11.001-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild