diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2005-05-31 06:55:03 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2005-05-31 06:55:03 (GMT) |
| commit | d4c5a3af25574faa40b6b14766e1a1d93c12b79a (patch) | |
| tree | b562d01fa3043e908fead9a8d99218f4af74d20d /config | |
| parent | 70e0e23c50b14b63bcaa99fff751bebd1ee09232 (diff) | |
| download | hdf5-d4c5a3af25574faa40b6b14766e1a1d93c12b79a.zip hdf5-d4c5a3af25574faa40b6b14766e1a1d93c12b79a.tar.gz hdf5-d4c5a3af25574faa40b6b14766e1a1d93c12b79a.tar.bz2 | |
[svn-r10828] Purpose:
feature.
Description:
Added two new make check targets,
check-s: serial tests
check-p: parallel tests.
Check will run check-s and check-p, have the same effect as before.
Added $TEST_SCRIPTS_PARA for parallel test scripts.
Platforms tested:
h5committested".
Also, tested in heping (serial and pp) to verify with previous
test output for consistency.
Tested in modi4 for the special case of pmake (in progress.)
Diffstat (limited to 'config')
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 43 |
2 files changed, 37 insertions, 7 deletions
diff --git a/config/commence.in b/config/commence.in index 7328296..0b2559a 100644 --- a/config/commence.in +++ b/config/commence.in @@ -74,6 +74,7 @@ PRIV_PROGS= TEST_PROGS_PARA= TEST_FLAGS= TEST_SCRIPTS= +TEST_SCRIPTS_PARA= AUX_LIB= EXAMPLE_PROGS= SUBDIRS= 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: |