[svn-r10849] Purpose:

bug fix

Description:
check-s and check-p were set as pre-requistics of test.  They
would get executed in parallel if parallel make is used.  This
could cause problems since serial tests are used to be executed
before parallel tests. It is not known if it is always okay to
run serial and parallel tests in simultantously.

Solution:
Change check-s and check-p as actions of the target test so
that they get executed sequnentially.

Platforms tested:
heping PP.

34 files changed, 102 insertions, 35 deletions

diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 3305149..35009ad 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -555,7 +555,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 0acf108..ebe10e2 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -740,7 +740,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 1600932..e8a644e 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -628,7 +628,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/config/conclude.am b/config/conclude.am
index 759bc88..082985d 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -48,8 +48,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
-
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/examples/Makefile.in b/examples/Makefile.in
index e2c1bb2..1fc321b 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -568,7 +568,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 9dffcd1..63ec756 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -671,7 +671,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 75d3b27..4488132 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -571,7 +571,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 8d532bd..a953330 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -850,7 +850,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 893e2e3..738b36d 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -835,7 +835,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 570cb26..b465cf1 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -601,7 +601,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/Makefile.in b/hl/Makefile.in
index 681ed89..64dde96 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -636,7 +636,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 86da551..9386f45 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -639,7 +639,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 46aa511..84fd373 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -661,7 +661,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 5901200..958858e 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -610,7 +610,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index fae338b..4345211 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -634,7 +634,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 49da7ef..1cfe525 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -682,7 +682,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 30e8a5c..bd1ada0 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -603,7 +603,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 12d8f84..ac3a8ac 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -649,7 +649,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 9f65857..9da8738 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -637,7 +637,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index d84299a..3a1abea 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -644,7 +644,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/perform/Makefile.in b/perform/Makefile.in
index e2c00a8..82ac287 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -703,7 +703,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/src/Makefile.in b/src/Makefile.in
index e5eeed8..829d30d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -952,7 +952,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/test/Makefile.in b/test/Makefile.in
index 72486f5..71a5da9 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1060,7 +1060,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index e20a1da..49dd7ea 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -642,7 +642,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 93e5a5c..cde0c4e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -641,7 +641,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index d84299a..3a1abea 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -644,7 +644,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 5bcc9be..310befd 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -686,7 +686,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 5266800..17e6f00 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -660,7 +660,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 01b32b9..73d6b89 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -651,7 +651,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 0b44a0f..1163866 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -677,7 +677,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index f2200eb..3cbbf2b 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -631,7 +631,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 9d8276d..101ae11 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -710,7 +710,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index bf2cdff..7ca9e0d 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -648,7 +648,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 5fe79be..7caf956 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -742,7 +742,9 @@ install-doc uninstall-doc:
 # TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
 check-TESTS: test
 
-test _test: check-s check-p
+test _test:
+	$(MAKE) check-s
+	$(MAKE) check-p
 
 check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \