summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-06-04 05:01:12 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-06-04 05:01:12 (GMT)
commit65107926e11495079dbefedfc22b04785b7f4449 (patch)
treef748e258df08e20f68eba1a86964fd4af1f17bfb /tools
parentb6859867772a078a275637c01b1a6ab54cf97866 (diff)
downloadhdf5-65107926e11495079dbefedfc22b04785b7f4449.zip
hdf5-65107926e11495079dbefedfc22b04785b7f4449.tar.gz
hdf5-65107926e11495079dbefedfc22b04785b7f4449.tar.bz2
[svn-r10858] Purpose:
bug fix. Description: The check-s and check-p targets are not recursively passes down. Make them so. Platforms tested: heping (serial and pp).
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in19
-rw-r--r--tools/gifconv/Makefile.in19
-rw-r--r--tools/h5diff/Makefile.in19
-rw-r--r--tools/h5dump/Makefile.in19
-rwxr-xr-xtools/h5import/Makefile.in19
-rw-r--r--tools/h5jam/Makefile.in19
-rw-r--r--tools/h5ls/Makefile.in19
-rw-r--r--tools/h5repack/Makefile.in19
-rw-r--r--tools/lib/Makefile.in19
-rw-r--r--tools/misc/Makefile.in19
10 files changed, 150 insertions, 40 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index cde0c4e..8a9008b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -642,10 +642,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -692,7 +702,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 3a1abea..9574696 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -645,10 +645,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -695,7 +705,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index b7c6df4..a5bf0b5 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -685,10 +685,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -735,7 +745,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 17e6f00..724a418 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -661,10 +661,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -711,7 +721,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 73d6b89..d7a2329 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -652,10 +652,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -702,7 +712,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 1163866..866b3b5 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -678,10 +678,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -728,7 +738,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 3cbbf2b..7a4bb64 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -632,10 +632,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -682,7 +692,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 101ae11..660e253 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -711,10 +711,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -761,7 +771,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 7ca9e0d..1a7369e 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -649,10 +649,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -699,7 +709,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 7caf956..60c4454 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -743,10 +743,20 @@ install-doc uninstall-doc:
check-TESTS: test
test _test:
- $(MAKE) check-s
- $(MAKE) check-p
+ $(MAKE) _check-s
+ $(MAKE) _check-p
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+ @$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1; \
+ for d in X $(SUBDIRS); do \
+ if test $$d != X -a $$d != .; then \
+ (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
+ fi; \
+ done
+
+# Actual execution of check-s.
+_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
@@ -793,7 +803,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_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