summaryrefslogtreecommitdiffstats
path: root/tools
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 /tools
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 'tools')
-rw-r--r--tools/Makefile.in4
-rw-r--r--tools/gifconv/Makefile.in4
-rw-r--r--tools/h5diff/Makefile.in4
-rw-r--r--tools/h5dump/Makefile.in4
-rwxr-xr-xtools/h5import/Makefile.in4
-rw-r--r--tools/h5jam/Makefile.in4
-rw-r--r--tools/h5ls/Makefile.in4
-rw-r--r--tools/h5repack/Makefile.in4
-rw-r--r--tools/lib/Makefile.in4
-rw-r--r--tools/misc/Makefile.in4
10 files changed, 30 insertions, 10 deletions
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 \