[svn-r12519] Fixed "make check-vfd"

"make check-vfd" will now run all tests in the test directory with different
file drivers (at least, all of those tests that use the testing framework's
FAPL).  Tests that fail will be skipped.

This is not a perfect fix, but is better than nothing.

Along with this change, check-vfd should be added to the Daily Tests.

5 files changed, 15 insertions, 10 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 0c024f7..66e9bac 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -853,13 +853,14 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 # Run test with different Virtual File Driver
-check-vfd:
+check-vfd: $(LIB) $(PROGS) $(TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
 	    if test $$vfd != dummy; then                                      \
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 51d72be..5e8836c 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -783,13 +783,14 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 # Run test with different Virtual File Driver
-check-vfd:
+check-vfd: $(LIB) $(PROGS) $(TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
 	    if test $$vfd != dummy; then                                      \
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 9988f0b..843e783 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -1063,13 +1063,14 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 # Run test with different Virtual File Driver
-check-vfd:
+check-vfd: $(LIB) $(PROGS) $(TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
 	    if test $$vfd != dummy; then                                      \
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 2455b74..094dd78 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -995,13 +995,14 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 # Run test with different Virtual File Driver
-check-vfd:
+check-vfd: $(LIB) $(PROGS) $(TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
 	    if test $$vfd != dummy; then                                      \
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 98de35e..296c12a 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -790,13 +790,14 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 # Run test with different Virtual File Driver
-check-vfd:
+check-vfd: $(LIB) $(PROGS) $(TESTS)
 	@for vfd in $(VFD_LIST) dummy; do                                     \
 	    if test $$vfd != dummy; then                                      \
 	        echo "============================";                          \
 	        echo "Testing Virtual File Driver $$vfd";                     \
 	        echo "============================";                          \
-	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
+	        $(MAKE) $(AM_MAKEFLAGS) check-clean || exit 1;                \
+	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.