[netcdf-cxx4/epel7] Enable mpich on EL7; Use %{mpi_list} in %check; Output test-suite.log on test failure
Orion Poplawski
orion at fedoraproject.org
Mon Feb 24 16:49:04 UTC 2014
commit d9f90c4536b7707686d7f6879ba8e2105b2b3436
Author: Orion Poplawski <orion at nwra.com>
Date: Mon Feb 24 09:49:53 2014 -0700
Enable mpich on EL7; Use %{mpi_list} in %check; Output test-suite.log on test failure
netcdf-cxx4.spec | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/netcdf-cxx4.spec b/netcdf-cxx4.spec
index 553019c..ce89ea8 100644
--- a/netcdf-cxx4.spec
+++ b/netcdf-cxx4.spec
@@ -16,9 +16,9 @@ BuildRequires: openssh-clients
%global with_mpich 1
%global with_openmpi 1
-%if 0%{?rhel}
+%if 0%{?rhel} <= 6
%ifarch ppc64
-# No mpich2 on ppc64 in EL
+# No mpich on ppc64 in EL6
%global with_mpich 0
%endif
%endif
@@ -187,11 +187,11 @@ done
%check
-make -C build check
-for mpi in mpich openmpi
+make -C build check || cat build/*/test-suite.log && exit 1
+for mpi in %{mpi_list}
do
module load mpi/$mpi-%{_arch}
- make -C $mpi check
+ make -C $mpi check || cat ${mpi}/*/test-suite.log && exit 1
module purge
done
More information about the scm-commits
mailing list