From 0db0de62441e31649dc97ad58b88a40ce1ceee1a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Mon, 13 Feb 2012 16:40:24 -0700
Subject: [PATCH] Use HDF5_Make_Ignore=yes to ignore make check errors

---
 hdf5-mpitest.patch | 12 ------------
 hdf5.spec          |  4 +---
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 hdf5-mpitest.patch

diff --git a/hdf5-mpitest.patch b/hdf5-mpitest.patch
deleted file mode 100644
index 1c4c088..0000000
--- a/hdf5-mpitest.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up hdf5-1.8.8/tools/h5diff/testh5diff.sh.mpitest hdf5-1.8.8/tools/h5diff/testh5diff.sh
---- hdf5-1.8.8/tools/h5diff/testh5diff.sh.mpitest	2012-02-09 16:04:02.193584720 -0700
-+++ hdf5-1.8.8/tools/h5diff/testh5diff.sh	2012-02-09 16:00:21.528660301 -0700
-@@ -435,7 +435,7 @@ TOOLTEST() {
- 	    echo " PASSED"
- 	else
- 	    echo "*FAILED*"
--	    nerrors="`expr $nerrors + 1`"
-+	    #nerrors="`expr $nerrors + 1`"
- 	    if test yes = "$verbose"; then
- 		echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
- 		$DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
diff --git a/hdf5.spec b/hdf5.spec
index bf92a5f..4243aef 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -13,8 +13,6 @@ Source0: http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-%{version}%{?snaprel}
 Source1: h5comp
 Patch0: hdf5-LD_LIBRARY_PATH.patch
 Patch1: hdf5-1.8.8-tstlite.patch
-# Patch mpi tests not to fail - openmpi outputs some extraneous output
-Patch2: hdf5-mpitest.patch
 # Fix typo bug in parallel h5diff
 Patch3: hdf5-ph5diff.patch
 
@@ -142,7 +140,6 @@ HDF5 parallel openmpi static libraries
 # the tstlite test fails with "stack smashing detected" on these arches
 %patch1 -p1 -b .tstlite
 %endif
-%patch2 -p1 -b .mpitest
 %patch3 -p1 -b .ph5diff
 #This should be fixed in 1.8.7
 find \( -name '*.[ch]*' -o -name '*.f90' -o -name '*.txt' \) -exec chmod -x {} +
@@ -257,6 +254,7 @@ EOF
 
 %check
 make -C build check
+export HDF5_Make_Ignore=yes
 for mpi in mpich2 openmpi
 do
   module load $mpi-%{_arch}