diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2005-06-04 05:01:12 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2005-06-04 05:01:12 (GMT) |
| commit | 65107926e11495079dbefedfc22b04785b7f4449 (patch) | |
| tree | f748e258df08e20f68eba1a86964fd4af1f17bfb /hl/c++ | |
| parent | b6859867772a078a275637c01b1a6ab54cf97866 (diff) | |
| download | hdf5-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 'hl/c++')
| -rw-r--r-- | hl/c++/Makefile.in | 19 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 19 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 19 |
3 files changed, 45 insertions, 12 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 9386f45..83e5769 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -640,10 +640,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 @@ -690,7 +700,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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 84fd373..2e5ff5e 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -662,10 +662,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 @@ -712,7 +722,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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 958858e..2e53a5d 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -611,10 +611,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 @@ -661,7 +671,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 |