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

5 files changed, 75 insertions, 20 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 63ec756..2af5569 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -672,10 +672,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
@@ -722,7 +732,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 4488132..804f97d 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -572,10 +572,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
@@ -622,7 +632,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a953330..330d3d3 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -851,10 +851,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
@@ -901,7 +911,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/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 738b36d..2fa6e3f 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -836,10 +836,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
@@ -886,7 +896,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index b465cf1..af17001 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -602,10 +602,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
@@ -652,7 +662,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