[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

53 files changed, 1279 insertions, 228 deletions

diff --git a/Makefile.am b/Makefile.am
index 58864e0..63786e0 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ DISTCLEANFILES=src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
 # These simply involve recursing into subdirectories.
 test _test: check
 
-lib progs:
+lib progs check-p check-s:
 	@@SETX@; for d in $(SUBDIRS); do                                \
           if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
diff --git a/Makefile.in b/Makefile.in
index 6bbcb6f..c3e8463 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -760,7 +760,7 @@ uninstall-info: uninstall-info-recursive
 # These simply involve recursing into subdirectories.
 test _test: check
 
-lib progs:
+lib progs check-p check-s:
 	@@SETX@; for d in $(SUBDIRS); do                                \
           if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 2999058..e239431 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -662,9 +662,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                                      \
@@ -685,6 +687,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"        \
@@ -714,7 +744,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                        \
@@ -734,8 +764,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/c++/examples/Makefile.in b/c++/examples/Makefile.in
index eb43708..3305149 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -555,9 +555,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                                      \
@@ -578,6 +580,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"        \
@@ -607,7 +637,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                        \
@@ -627,8 +657,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/c++/src/Makefile.in b/c++/src/Makefile.in
index c95acd3..0acf108 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -740,9 +740,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                                      \
@@ -763,6 +765,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"        \
@@ -792,7 +822,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                        \
@@ -812,8 +842,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/c++/test/Makefile.in b/c++/test/Makefile.in
index 3d8c504..1600932 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -628,9 +628,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                                      \
@@ -651,6 +653,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"        \
@@ -680,7 +710,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                        \
@@ -700,8 +730,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/config/commence-doc.am b/config/commence-doc.am
index 2d746a1..f3dea24 100644
--- a/config/commence-doc.am
+++ b/config/commence-doc.am
@@ -5,7 +5,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/config/conclude.am b/config/conclude.am
index 6354196..759bc88 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -48,9 +48,12 @@ 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                                      \
@@ -71,6 +74,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"        \
@@ -100,7 +131,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                        \
@@ -120,8 +151,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/doc/Makefile.in b/doc/Makefile.in
index 589c3c3..ee74c3d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -592,7 +592,7 @@ uninstall-info: uninstall-info-recursive
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in
index 7419614..2c819b4 100644
--- a/doc/html/ADGuide/Makefile.in
+++ b/doc/html/ADGuide/Makefile.in
@@ -463,7 +463,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in
index afa363a..eb24c69 100644
--- a/doc/html/Graphics/Makefile.in
+++ b/doc/html/Graphics/Makefile.in
@@ -461,7 +461,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in
index 2f436e9..b581941 100644
--- a/doc/html/Intro/Makefile.in
+++ b/doc/html/Intro/Makefile.in
@@ -461,7 +461,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 72eaa31..b2238b3 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -646,7 +646,7 @@ uninstall-info: uninstall-info-recursive
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in
index 8f2e4a1..c7b9ac2 100644
--- a/doc/html/PSandPDF/Makefile.in
+++ b/doc/html/PSandPDF/Makefile.in
@@ -427,7 +427,7 @@ uninstall-am: uninstall-info-am
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in
index 5be5c7b..d489138 100644
--- a/doc/html/TechNotes/Makefile.in
+++ b/doc/html/TechNotes/Makefile.in
@@ -470,7 +470,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in
index 6f3efd4..fdcb8b5 100644
--- a/doc/html/Tutor/Graphics/Makefile.in
+++ b/doc/html/Tutor/Graphics/Makefile.in
@@ -469,7 +469,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in
index d18081f..e408232 100644
--- a/doc/html/Tutor/Makefile.in
+++ b/doc/html/Tutor/Makefile.in
@@ -627,7 +627,7 @@ uninstall-info: uninstall-info-recursive
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in
index ee99a99..e1ae4d0 100644
--- a/doc/html/Tutor/examples/Makefile.in
+++ b/doc/html/Tutor/examples/Makefile.in
@@ -506,7 +506,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA \
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in
index ebe9713..af55e55 100644
--- a/doc/html/cpplus/Makefile.in
+++ b/doc/html/cpplus/Makefile.in
@@ -461,7 +461,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in
index 06cd3d9..beda1a0 100644
--- a/doc/html/ed_libs/Makefile.in
+++ b/doc/html/ed_libs/Makefile.in
@@ -465,7 +465,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in
index ee44615..1247c12 100644
--- a/doc/html/ed_styles/Makefile.in
+++ b/doc/html/ed_styles/Makefile.in
@@ -464,7 +464,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in
index 2097a98..89ae5fe 100644
--- a/doc/html/fortran/Makefile.in
+++ b/doc/html/fortran/Makefile.in
@@ -461,7 +461,7 @@ uninstall-am: uninstall-info-am uninstall-localdocDATA
 
 
 # Ignore most rules
-lib progs check test _test:
+lib progs check test _test check-p check-s:
 	@echo "Nothing to be done"
 
 tests dep depend:
diff --git a/examples/Makefile.in b/examples/Makefile.in
index e6665af..e2c1bb2 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -568,9 +568,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                                      \
@@ -591,6 +593,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"        \
@@ -620,7 +650,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                        \
@@ -640,8 +670,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/fortran/Makefile.in b/fortran/Makefile.in
index b9967e1..9dffcd1 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -671,9 +671,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                                      \
@@ -694,6 +696,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"        \
@@ -723,7 +753,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                        \
@@ -743,8 +773,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index f69a029..75d3b27 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -571,9 +571,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                                      \
@@ -594,6 +596,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"        \
@@ -623,7 +653,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                        \
@@ -643,8 +673,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 6cfae71..8d532bd 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -850,9 +850,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                                      \
@@ -873,6 +875,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"        \
@@ -902,7 +932,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                        \
@@ -922,8 +952,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/fortran/test/Makefile.in b/fortran/test/Makefile.in
index de457a4..893e2e3 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -835,9 +835,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                                      \
@@ -858,6 +860,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"        \
@@ -887,7 +917,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                        \
@@ -907,8 +937,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 19ec8f6..570cb26 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -601,9 +601,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                                      \
@@ -624,6 +626,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"        \
@@ -653,7 +683,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                        \
@@ -673,8 +703,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/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
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 4df3b67..e2c00a8 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -703,9 +703,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                                      \
@@ -726,6 +728,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"        \
@@ -755,7 +785,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                        \
@@ -775,8 +805,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/src/Makefile.in b/src/Makefile.in
index 050139d..e5eeed8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -952,9 +952,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                                      \
@@ -975,6 +977,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"        \
@@ -1004,7 +1034,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                        \
@@ -1024,8 +1054,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/test/Makefile.in b/test/Makefile.in
index a996b94..72486f5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1060,9 +1060,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                                      \
@@ -1083,6 +1085,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"        \
@@ -1112,7 +1142,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                        \
@@ -1132,8 +1162,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/testpar/Makefile.am b/testpar/Makefile.am
index 839a816..56ccfef 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test
 # Test programs and scripts.  These are our main targets.
 #
 TEST_PROG_PARA=t_mpi t_fphdf5 testphdf5
-TEST_SCRIPT=testph5.sh
+TEST_SCRIPT_PARA=testph5.sh
 
 check_PROGRAMS = $(TEST_PROG_PARA)
 check_SCRIPTS= $(TEST_SCRIPT)
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 5c5c790..c87b2e4 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -642,9 +642,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                                      \
@@ -665,6 +667,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"        \
@@ -694,7 +724,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                        \
@@ -714,8 +744,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/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