[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

4 files changed, 144 insertions, 24 deletions

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