summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-06-02 23:42:48 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-06-02 23:42:48 (GMT)
commita2217d58c847974b722729d3f3e016d597c70f0c (patch)
tree50796e622f7a7fbd66facda24bed5d550613f0a4 /hl
parent10247df1bce417cebd4ef269c462dd56afc2628b (diff)
downloadhdf5-a2217d58c847974b722729d3f3e016d597c70f0c.zip
hdf5-a2217d58c847974b722729d3f3e016d597c70f0c.tar.gz
hdf5-a2217d58c847974b722729d3f3e016d597c70f0c.tar.bz2
[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.
Diffstat (limited to 'hl')
-rwxr-xr-xhl/Makefile.in4
-rw-r--r--hl/c++/Makefile.in4
-rw-r--r--hl/c++/src/Makefile.in4
-rw-r--r--hl/c++/test/Makefile.in4
-rw-r--r--hl/fortran/Makefile.in4
-rw-r--r--hl/fortran/src/Makefile.in4
-rw-r--r--hl/fortran/test/Makefile.in4
-rw-r--r--hl/src/Makefile.in4
-rw-r--r--hl/test/Makefile.in4
-rw-r--r--hl/tools/gif2h5/Makefile.in4
10 files changed, 30 insertions, 10 deletions
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 \