[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.
2025-02-17 16:10:24 +08:00 · 2005-06-02 18:42:48 -05:00 · 2005-06-02 18:42:48 -05:00 · a2217d58c8
commit a2217d58c8
parent 10247df1bc
34 changed files with 102 additions and 35 deletions
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \
--- 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      \