summaryrefslogtreecommitdiffstats
path: root/testpar
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 /testpar
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 'testpar')
-rw-r--r--testpar/Makefile.in19
1 files changed, 15 insertions, 4 deletions
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 49dd7ea..c695f16 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -643,10 +643,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
@@ -693,7 +703,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