summaryrefslogtreecommitdiffstats
path: root/config/conclude.in
diff options
context:
space:
mode:
Diffstat (limited to 'config/conclude.in')
-rw-r--r--config/conclude.in43
1 files changed, 36 insertions, 7 deletions
diff --git a/config/conclude.in b/config/conclude.in
index 587a48e..9dd57d3 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -37,6 +37,24 @@ TAGS: $(LIB_SRC)
tests: $(TEST_PROGS) $(TEST_PROGS_PARA) $(TEST_SCRIPTS) $(LIB)
check test _test: tests
@echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="
+ $(MAKE) _check-s
+ $(MAKE) _check-p
+ @echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`==="
+
+## serial tests
+check-s: tests
+ @echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="
+ $(MAKE) _check-s
+ @echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`==="
+
+## parallel tests
+check-p: tests
+ @echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="
+ $(MAKE) _check-p
+ @echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`==="
+
+## Actual execution of sequtial tests.
+_check-s: tests
@for test in $(TEST_PROGS) dummy; do \
if test $$test != dummy; then \
echo "============================"; \
@@ -50,6 +68,23 @@ check test _test: tests
fi; \
done; \
test $$test = dummy || false
+ @for test in $(TEST_SCRIPTS) dummy; do \
+ if test $$test != dummy; then \
+ echo "============================"; \
+ echo "Testing $$test $(TEST_FLAGS)"; \
+ echo "============================"; \
+ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \
+ srcdir="$(srcdir)" \
+ /bin/sh $$test $(TEST_FLAGS) || \
+ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
+ break; \
+ echo ""; \
+ fi; \
+ done; \
+ test $$test = dummy || false
+
+## Actual execution of parallel tests.
+_check-p: tests
@if test -n "$(TEST_PROGS_PARA)"; then \
echo "**** Hint ****"; \
echo "Parallel test files reside in the current directory" \
@@ -73,7 +108,7 @@ check test _test: tests
fi; \
done; \
test $$test = dummy || false
- @for test in $(TEST_SCRIPTS) dummy; do \
+ @for test in $(TEST_SCRIPTS_PARA) dummy; do \
if test $$test != dummy; then \
echo "============================"; \
echo "Testing $$test $(TEST_FLAGS)"; \
@@ -87,12 +122,6 @@ check test _test: tests
fi; \
done; \
test $$test = dummy || false
- @echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`==="
- @for d in X $(SUBDIRS); do \
- if test $$d != X; then \
- (set -x; cd $$d && $(MAKE) tests) || exit 1; \
- fi; \
- done
## Run test with different Virtual File Driver
check-vfd: