[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).

1 files changed, 15 insertions, 4 deletions

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