summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in19
-rw-r--r--c++/examples/Makefile.in19
-rw-r--r--c++/src/Makefile.in19
-rw-r--r--c++/test/Makefile.in19
4 files changed, 60 insertions, 16 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 2a3ba8f..8c10bf9 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -663,10 +663,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
@@ -713,7 +723,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/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 35009ad..b2ebeba 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -556,10 +556,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
@@ -606,7 +616,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/c++/src/Makefile.in b/c++/src/Makefile.in
index ebe10e2..0bcf7c7 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -741,10 +741,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
@@ -791,7 +801,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/c++/test/Makefile.in b/c++/test/Makefile.in
index e8a644e..61b2e33 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -629,10 +629,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
@@ -679,7 +689,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