[svn-r10840] Purpose:

Added check-s and check-p targets.

Description:
Added check-s and check-p targets to 1.7 branch to match changes to 1.6
branch.  Now parallel and serial tests can be run separately.

Platforms tested:
mir, modi4, copper

10 files changed, 360 insertions, 60 deletions

diff --git a/hl/Makefile.in b/hl/Makefile.in
index 6f5cc45..681ed89 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -636,9 +636,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -659,6 +661,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -688,7 +718,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -708,8 +738,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 1d60af7..86da551 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -639,9 +639,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -662,6 +664,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -691,7 +721,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -711,8 +741,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index d018e2b..46aa511 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -661,9 +661,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -684,6 +686,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -713,7 +743,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -733,8 +763,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index cb1fef4..5901200 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -610,9 +610,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -633,6 +635,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -662,7 +692,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -682,8 +712,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 84b5173..fae338b 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -634,9 +634,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -657,6 +659,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -686,7 +716,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -706,8 +736,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index e1ad254..49da7ef 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -682,9 +682,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -705,6 +707,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -734,7 +764,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -754,8 +784,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index a42ae3f..30e8a5c 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -603,9 +603,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -626,6 +628,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -655,7 +685,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -675,8 +705,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index b2208a8..12d8f84 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -649,9 +649,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -672,6 +674,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -701,7 +731,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -721,8 +751,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 87ddb2e..9f65857 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -637,9 +637,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -660,6 +662,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -689,7 +719,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -709,8 +739,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 5e742e5..d84299a 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -644,9 +644,11 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: $(PROGS) $(TESTS)
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	   echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+check-s: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
 	@for test in $(TEST_PROG) dummy; do                                  \
 	   if test $$test != dummy; then                                      \
@@ -667,6 +669,34 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
+	@for test in $(TEST_SCRIPT) dummy; do                                \
+	   if test $$test != dummy; then                                      \
+	      echo "============================";                            \
+	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
+	         echo "Fortran API: Testing $$test $(TEST_FLAGS)";            \
+	      elif test "X$(HDF_CXX)" = "Xyes"; then                          \
+	         echo "C++ API: Testing $$test $(TEST_FLAGS)";                \
+	      else                                                            \
+	         echo "Testing $$test $(TEST_FLAGS)";                         \
+	      fi;                                                             \
+	      echo "============================";                            \
+	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
+	         srcdir="$(srcdir)"                                           \
+	         /bin/sh $$test $(TEST_FLAGS) ||                              \
+	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||     \
+	         break;                                                       \
+	      echo "";                                                        \
+	  fi;                                                                 \
+	done;                                                                 \
+	test $$test = dummy || false
+	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
+	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	fi
+
+check-p: $(LIB) $(PROGS) $(TESTS)
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+        fi
 	@if test -n "$(TEST_PROG_PARA)"; then                                \
 	    echo "**** Hint ****";                                            \
 	    echo "Parallel test files reside in the current directory"        \
@@ -696,7 +726,7 @@ test _test: $(PROGS) $(TESTS)
 	   fi;                                                                \
 	done;                                                                 \
 	test $$test = dummy || false
-	@for test in $(TEST_SCRIPT) dummy; do                                \
+	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	   if test $$test != dummy; then                                      \
 	      echo "============================";                            \
 	      if test "X$(HDF_FORTRAN)" = "Xyes"; then                        \
@@ -716,8 +746,8 @@ test _test: $(PROGS) $(TESTS)
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false
-	@if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then      \
-	    echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
+	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
 # Run test with different Virtual File Driver