[nwchem] explicit requires; tests excluded on Fedora 21 i686 (hang)

[Marcin Dulak]

commit 1e0b84fe9078c1bdad4cd413e56705274b918dc4
Author: marcindulak <Marcin.Dulak at gmail.com>
Date:   Fri Jun 13 17:06:51 2014 +0200

    explicit requires; tests excluded on Fedora 21 i686 (hang)

 nwchem.spec |   54 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 30 insertions(+), 24 deletions(-)
---
diff --git a/nwchem.spec b/nwchem.spec
index 094ff4f..4c8bce1 100644
--- a/nwchem.spec
+++ b/nwchem.spec
@@ -261,9 +261,9 @@ cat <<EOF > %{PKG_TOP}/%{name}.sh
 PA=%{_datadir}/%{name}/libraries/
 
 case \$NWCHEM_BASIS_LIBRARY in
-  *\${PA}*);;
-  *?*) NWCHEM_BASIS_LIBRARY=\${PA}:\${NWCHEM_BASIS_LIBRARY};;
-  *) NWCHEM_BASIS_LIBRARY=\${PA};;
+*\${PA}*);;
+*?*) NWCHEM_BASIS_LIBRARY=\${PA}:\${NWCHEM_BASIS_LIBRARY};;
+*) NWCHEM_BASIS_LIBRARY=\${PA};;
 esac
 export NWCHEM_BASIS_LIBRARY
 
@@ -271,9 +271,9 @@ export NWCHEM_BASIS_LIBRARY
 PA=%{_datadir}/%{name}/libraryps/
 
 case \$NWCHEM_NWPW_LIBRARY in
-  *\${PA}*);;
-  *?*) NWCHEM_NWPW_LIBRARY=\${PA}:\${NWCHEM_NWPW_LIBRARY};;
-  *) NWCHEM_NWPW_LIBRARY=\${PA};;
+*\${PA}*);;
+*?*) NWCHEM_NWPW_LIBRARY=\${PA}:\${NWCHEM_NWPW_LIBRARY};;
+*) NWCHEM_NWPW_LIBRARY=\${PA};;
 esac
 export NWCHEM_NWPW_LIBRARY
 
@@ -288,11 +288,11 @@ cat <<EOF > %{PKG_TOP}/%{name}.csh
 set PA=%{_datadir}/%{name}/libraries/
 
 if (\$?NWCHEM_BASIS_LIBRARY) then
-	if ("\$NWCHEM_BASIS_LIBRARY" !~ *\${PA}*) then
-		setenv NWCHEM_BASIS_LIBRARY \${PA}:\${NWCHEM_BASIS_LIBRARY}
-	endif
+if ("\$NWCHEM_BASIS_LIBRARY" !~ *\${PA}*) then
+	setenv NWCHEM_BASIS_LIBRARY \${PA}:\${NWCHEM_BASIS_LIBRARY}
+endif
 else
-	setenv NWCHEM_BASIS_LIBRARY \${PA}
+setenv NWCHEM_BASIS_LIBRARY \${PA}
 endif
 
 unset PA
@@ -301,11 +301,11 @@ unset PA
 set PA=%{_datadir}/%{name}/libraryps/
 
 if (\$?NWCHEM_NWPW_LIBRARY) then
-	if ("\$NWCHEM_NWPW_LIBRARY" !~ *\${PA}*) then
-		setenv NWCHEM_NWPW_LIBRARY \${PA}:\${NWCHEM_NWPW_LIBRARY}
-	endif
+if ("\$NWCHEM_NWPW_LIBRARY" !~ *\${PA}*) then
+	setenv NWCHEM_NWPW_LIBRARY \${PA}:\${NWCHEM_NWPW_LIBRARY}
+endif
 else
-	setenv NWCHEM_NWPW_LIBRARY \${PA}
+setenv NWCHEM_NWPW_LIBRARY \${PA}
 endif
 
 unset PA
@@ -336,9 +336,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 
 # *.bak files not allowed by rpmlint
 for file in `find %{PKG_TOP} -name "*.bak"`; do
-  rm -f ${file}
+rm -f ${file}
 done
- 
+
 # To avoid replicated code define a macro
 %global doinstall() \
 mkdir -p $RPM_BUILD_ROOT/$MPI_BIN; \
@@ -370,10 +370,10 @@ install -p -m 444 %{PKG_TOP}/%{name}*.*sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.
 
 # To avoid: "Found '/tmp/rpmbuild/build/' in installed files; aborting"
 for file in `find %{PKG_TOP} -name "*.log"`; do
-  %{__sed} -i "s|$RPM_BUILD_ROOT||g" ${file}
+%{__sed} -i "s|$RPM_BUILD_ROOT||g" ${file}
 done
 for file in `find %{PKG_TOP} -name "*.sh"`; do
-  %{__sed} -i "s|$RPM_BUILD_ROOT||g" ${file}
+%{__sed} -i "s|$RPM_BUILD_ROOT||g" ${file}
 done
 
 
@@ -384,10 +384,17 @@ export NWCHEM_TARGET=%{NWCHEM_TARGET}
 export NWCHEM_BASIS_LIBRARY=$RPM_BUILD_ROOT%{_datadir}/%{name}/libraries/
 export NWCHEM_NWPW_LIBRARY=$RPM_BUILD_ROOT%{_datadir}/%{name}/libraryps/
 
-mv QA QA.orig
+mv QA QA.orig.orig
+cp -rp QA.orig.orig QA.orig
 
-# cosmo_h2o_dft hangs on i386? MD Feb 8 2012
-# h2o-response hangs on i386? MD Jul 31 2013
+%if %{NWCHEM_TARGET} == LINUX
+%if 0%{?fedora} == 21
+# small_intchk (and more) hang on Fedora 21 i386? MD Jun 10 2014
+%{__sed} -i '/runtests.mpi.unix/d' QA.orig/doafewqmtests.mpi
+echo './runtests.mpi.unix procs $np h2o_bnl' >> QA.orig/doafewqmtests.mpi
+echo './runtests.mpi.unix procs $np h2o-response' >> QA.orig/doafewqmtests.mpi
+%endif
+%endif
 
 export NPROC=2 # test on 2 cores
 
@@ -399,8 +406,6 @@ export LD_LIBRARY_PATH=${MPI_LIB}; \
 export PATH=${MPI_BIN}:${PATH}; \
 export MPIRUN_PATH=${MPI_BIN}/mpiexec; \
 export NWCHEM_EXECUTABLE=$NWCHEM_TOP/bin/$NWCHEM_TARGET/nwchem$MPI_SUFFIX; \
-%{__sed} -i '/cosmo_h2o_dft/d' doafewqmtests.mpi; \
-%{__sed} -i '/h2o-response/d' doafewqmtests.mpi; \
 time ./doafewqmtests.mpi ${NPROC} 2>&1 | tee ../doafewqmtests.mpi.${NPROC}$MPI_SUFFIX.log; \
 mv testoutputs ../testoutputs.doafewqmtests.mpi.${NPROC}$MPI_SUFFIX.log; \
 cd ..; \
@@ -439,8 +444,9 @@ mv QA.orig QA
 
 
 %changelog
-* Sat Jun 7 2014 Marcin Dulak <Marcin.Dulak at gmail.com> - 6.3.2-11
+* Tue Jun 10 2014 Marcin Dulak <Marcin.Dulak at gmail.com> - 6.3.2-11
 - explicit Requires needed bug #1105509
+- excluding tests (hang on Fedora 21 i686)
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild