[elpa/epel7] make each individual test output its full log upon failure
Dominik Mierzejewski
rathann at fedoraproject.org
Tue Mar 24 13:58:00 UTC 2015
commit 1e7ebb1dbc2be9ae6e63766ef4cfa65a3839a3b1
Author: Dominik 'Rathann' Mierzejewski <dominik at greysector.net>
Date: Tue Mar 24 14:56:20 2015 +0100
make each individual test output its full log upon failure
elpa-rpm.patch | 28 ++++++++++++++--------------
elpa.spec | 11 +++++++----
2 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/elpa-rpm.patch b/elpa-rpm.patch
index 6b0a017..f889df3 100644
--- a/elpa-rpm.patch
+++ b/elpa-rpm.patch
@@ -1,6 +1,6 @@
diff -up mpich/elpa.pc.in.r mpich/elpa.pc.in
--- mpich/elpa.pc.in.r 2015-03-16 11:39:51.000000000 +0100
-+++ mpich/elpa.pc.in 2015-03-20 10:59:37.966517510 +0100
++++ mpich/elpa.pc.in 2015-03-24 14:46:15.776044997 +0100
@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
URL: @PACKAGE_URL@
Libs: -L${libdir} -lelpa at SUFFIX@ @LIBS@ @OPENMP_FCFLAGS@
@@ -9,63 +9,63 @@ diff -up mpich/elpa.pc.in.r mpich/elpa.pc.in
+fcflags= -I${libdir}/gfortran/modules @OPENMP_FCFLAGS@
diff -up mpich/Makefile.am.r mpich/Makefile.am
--- mpich/Makefile.am.r 2015-03-17 16:05:37.000000000 +0100
-+++ mpich/Makefile.am 2015-03-20 10:59:37.967517516 +0100
-@@ -204,47 +204,47 @@ check_SCRIPTS = \
++++ mpich/Makefile.am 2015-03-24 14:52:25.520859067 +0100
+@@ -204,47 +206,47 @@ check_SCRIPTS = \
TESTS = $(check_SCRIPTS)
elpa1_test_real.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real at SUFFIX@.sh.log' > elpa1_test_real.sh
chmod +x elpa1_test_real.sh
elpa1_test_real_with_c.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_with_c.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_with_c at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real_with_c at SUFFIX@.sh.log' > elpa1_test_real_with_c.sh
chmod +x elpa1_test_real_with_c.sh
elpa1_test_real_c_version.sh:
- echo 'mpiexec -n 2 ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS' > elpa1_test_real_c_version.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_real_c_version at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_real_c_version at SUFFIX@.sh.log' > elpa1_test_real_c_version.sh
chmod +x elpa1_test_real_c_version.sh
elpa2_test_real.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real at SUFFIX@.sh.log' > elpa2_test_real.sh
chmod +x elpa2_test_real.sh
elpa2_test_real_default_kernel.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real_default_kernel at SUFFIX@.sh.log' > elpa2_test_real_default_kernel.sh
chmod +x elpa2_test_real_default_kernel.sh
elpa2_test_real_default_kernel_qr_decomposition.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@' > elpa2_test_real_default_kernel_qr_decomposition.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@ || cat ./elpa2_test_real_default_kernel_qr_decomposition at SUFFIX@.sh.log' > elpa2_test_real_default_kernel_qr_decomposition.sh
chmod +x elpa2_test_real_default_kernel_qr_decomposition.sh
elpa2_test_real_choose_kernel_with_api.sh:
- echo 'mpiexec -n 2 ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_real_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_real_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_real_choose_kernel_with_api at SUFFIX@.sh.log' > elpa2_test_real_choose_kernel_with_api.sh
chmod +x elpa2_test_real_choose_kernel_with_api.sh
elpa1_test_complex.sh:
- echo 'mpiexec -n 2 ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa1_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa1_test_complex at SUFFIX@ $$TEST_FLAGS || cat ./elpa1_test_complex at SUFFIX@.sh.log' > elpa1_test_complex.sh
chmod +x elpa1_test_complex.sh
elpa2_test_complex.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex at SUFFIX@.sh.log' > elpa2_test_complex.sh
chmod +x elpa2_test_complex.sh
elpa2_test_complex_default_kernel.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_default_kernel.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_default_kernel at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex_default_kernel at SUFFIX@.sh.log' > elpa2_test_complex_default_kernel.sh
chmod +x elpa2_test_complex_default_kernel.sh
elpa2_test_complex_choose_kernel_with_api.sh:
- echo 'mpiexec -n 2 ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
-+ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS' > elpa2_test_complex_choose_kernel_with_api.sh
++ echo 'mpiexec -n `getconf _NPROCESSORS_ONLN` ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@ $$TEST_FLAGS || cat ./elpa2_test_complex_choose_kernel_with_api at SUFFIX@.sh.log' > elpa2_test_complex_choose_kernel_with_api.sh
chmod +x elpa2_test_complex_choose_kernel_with_api.sh
elpa2_utilities.i: $(top_srcdir)/src/elpa2_utilities.F90
diff --git a/elpa.spec b/elpa.spec
index 27e01e0..ce5e9a9 100644
--- a/elpa.spec
+++ b/elpa.spec
@@ -1,7 +1,7 @@
Summary: High-performance library for parallel solution of eigenvalue problems
Name: elpa
Version: 2015.02.002
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://elpa.rzg.mpg.de/
Source0: http://elpa.rzg.mpg.de/elpa-%{version}.tar.gz
# fix pkgconfig file
@@ -196,10 +196,10 @@ done
%check
%{_mpich_load}
pushd mpich
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1
popd
pushd _openmp/mpich
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1
popd
%{_mpich_unload}
@@ -208,7 +208,7 @@ popd
%ifnarch armv7hl i686
%{_openmpi_load}
pushd openmpi
-make check V=1 || cat elpa1_test_real_c_version.sh.log
+make check V=1
popd
%{_openmpi_unload}
%endif
@@ -262,6 +262,9 @@ popd
%exclude %{_fmoddir}/openmpi%{?_cc_name_suffix}/*_openmp.mod
%changelog
+* Tue Mar 24 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-2
+- make each individual test output its full log upon failure
+
* Thu Mar 19 2015 Dominik Mierzejewski <rpm at greysector.net> 2015.02.002-1
- update to 2015.02.002 release (ABI change)
- drop libtool bug workaround
More information about the scm-commits
mailing list