summaryrefslogtreecommitdiffstats
path: root/config/conclude.am
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-06-02 01:51:52 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-06-02 01:51:52 (GMT)
commit2423bd6cabae9a027677b0141c91fedba4ec990b (patch)
tree6d0af2a93639db94e016cadbf71e4298e4a3ce7d /config/conclude.am
parentaa048ea6ff2db746828a7cea3a3a1962a5b4f23d (diff)
downloadhdf5-2423bd6cabae9a027677b0141c91fedba4ec990b.zip
hdf5-2423bd6cabae9a027677b0141c91fedba4ec990b.tar.gz
hdf5-2423bd6cabae9a027677b0141c91fedba4ec990b.tar.bz2
[svn-r10840] Purpose:
Added check-s and check-p targets. Description: Added check-s and check-p targets to 1.7 branch to match changes to 1.6 branch. Now parallel and serial tests can be run separately. Platforms tested: mir, modi4, copper
Diffstat (limited to 'config/conclude.am')
-rw-r--r--config/conclude.am43
1 files changed, 37 insertions, 6 deletions
diff --git a/config/conclude.am b/config/conclude.am
index 6354196..759bc88 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -48,9 +48,12 @@ install-doc uninstall-doc:
# TEST_PROG_PARA, or TEST_SCRIPT will actually be executed.
check-TESTS: test
-test _test: $(PROGS) $(TESTS)
- @if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then \
- echo "===Tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
+test _test: check-s check-p
+
+
+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
@for test in $(TEST_PROG) dummy; do \
if test $$test != dummy; then \
@@ -71,6 +74,34 @@ test _test: $(PROGS) $(TESTS)
fi; \
done; \
test $$test = dummy || false
+ @for test in $(TEST_SCRIPT) dummy; do \
+ if test $$test != dummy; then \
+ echo "============================"; \
+ if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+ echo "Fortran API: Testing $$test $(TEST_FLAGS)"; \
+ elif test "X$(HDF_CXX)" = "Xyes"; then \
+ echo "C++ API: Testing $$test $(TEST_FLAGS)"; \
+ else \
+ echo "Testing $$test $(TEST_FLAGS)"; \
+ fi; \
+ 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
+ @if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then \
+ echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+ fi
+
+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
@if test -n "$(TEST_PROG_PARA)"; then \
echo "**** Hint ****"; \
echo "Parallel test files reside in the current directory" \
@@ -100,7 +131,7 @@ test _test: $(PROGS) $(TESTS)
fi; \
done; \
test $$test = dummy || false
- @for test in $(TEST_SCRIPT) dummy; do \
+ @for test in $(TEST_SCRIPT_PARA) dummy; do \
if test $$test != dummy; then \
echo "============================"; \
if test "X$(HDF_FORTRAN)" = "Xyes"; then \
@@ -120,8 +151,8 @@ test _test: $(PROGS) $(TESTS)
fi; \
done; \
test $$test = dummy || false
- @if test -n "$(TEST_PROG)$(TEST_PROG_PARA)$(TEST_SCRIPT)"; then \
- echo "===Tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
+ @if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then \
+ echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
fi
# Run test with different Virtual File Driver