[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/tools/Makefile.in b/tools/Makefile.in
index 3693e3b..93e5a5c 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -641,9 +641,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                                      \
@@ -664,6 +666,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"        \
@@ -693,7 +723,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                        \
@@ -713,8 +743,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/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 5e742e5..d84299a 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/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
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 2c09406..5bcc9be 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -686,9 +686,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                                      \
@@ -709,6 +711,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"        \
@@ -738,7 +768,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                        \
@@ -758,8 +788,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/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 7f91fe3..5266800 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -660,9 +660,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                                      \
@@ -683,6 +685,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"        \
@@ -712,7 +742,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                        \
@@ -732,8 +762,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/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 4aff9dc..01b32b9 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -651,9 +651,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                                      \
@@ -674,6 +676,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"        \
@@ -703,7 +733,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                        \
@@ -723,8 +753,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/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 0505d86..0b44a0f 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -677,9 +677,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                                      \
@@ -700,6 +702,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"        \
@@ -729,7 +759,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                        \
@@ -749,8 +779,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/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index f868ebd..f2200eb 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -631,9 +631,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                                      \
@@ -654,6 +656,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"        \
@@ -683,7 +713,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                        \
@@ -703,8 +733,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/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 75c0e42..9d8276d 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -710,9 +710,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                                      \
@@ -733,6 +735,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"        \
@@ -762,7 +792,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                        \
@@ -782,8 +812,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/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 0e9982e..bf2cdff 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -648,9 +648,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                                      \
@@ -671,6 +673,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"        \
@@ -700,7 +730,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                        \
@@ -720,8 +750,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/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 35481c4..db7c190 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -696,9 +696,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                                      \
@@ -719,6 +721,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"        \
@@ -748,7 +778,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                        \
@@ -768,8 +798,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