diff options
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 19 | ||||
| -rw-r--r-- | perform/Makefile.in | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/config/commence.in b/config/commence.in index b60d185..b0b987c 100644 --- a/config/commence.in +++ b/config/commence.in @@ -68,6 +68,7 @@ PUB_DOCS= PUB_SUBDOCS= PROGS= TEST_PROGS= +TEST_PROGS_PARA= TEST_FLAGS= TEST_SCRIPTS= diff --git a/config/conclude.in b/config/conclude.in index 67f50bc..c24a87e 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -33,7 +33,7 @@ TAGS: $(LIB_SRC) ## Since tests are done in a shell loop, "make -i" does apply inside it. ## Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. ## -tests: $(TEST_PROGS) $(LIB) +tests: $(TEST_PROGS) $(TEST_PROGS_PARA) $(LIB) check test _test: tests @for test in $(TEST_PROGS) dummy; do \ if test $$test != dummy; then \ @@ -48,6 +48,19 @@ check test _test: tests fi; \ done; \ test $$test = dummy || false + @for test in $(TEST_PROGS_PARA) dummy; do \ + if test $$test != dummy; then \ + echo "============================"; \ + echo "Testing $$test $(TEST_FLAGS)"; \ + echo "============================"; \ + srcdir="$(srcdir)" \ + $(RUNPARALLEL) ./$$test $(TEST_FLAGS) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + break; \ + echo ""; \ + fi; \ + done; \ + test $$test = dummy || false @for test in $(TEST_SCRIPTS) dummy; do \ if test $$test != dummy; then \ echo "============================"; \ @@ -210,8 +223,8 @@ clean: mostlyclean (set -x; cd $$d; $(MAKE) $@) || exit 1; \ fi; \ done - @if test -n "$(LIB)" -o -n "$(TEST_PROGS)" -o -n "$(PROGS)" -o -n "$(CLEAN)"; then \ - $(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN); \ + @if test -n "$(LIB)" -o -n "$(TEST_PROGS)" -o -n "$(TEST_PROGS_PARA)" -o -n "$(PROGS)" -o -n "$(CLEAN)"; then \ + $(RM) $(LIB) $(TEST_PROGS) $(TEST_PROGS_PARA) $(PROGS) $(CLEAN); \ fi; -$(RM) -r .libs diff --git a/perform/Makefile.in b/perform/Makefile.in index 8c63706..18a2229 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -17,8 +17,7 @@ LIBH5TEST=../test/libh5test.la ## These are the programs that `make all' or `make tests' will build and which ## `make check' will run. List them in the order they should be run. TEST_PROGS_PARA=mpi-perf perf -TEST_PROGS=iopipe chunk overhead \ - $(TEST_PROGS_PARA) +TEST_PROGS=iopipe chunk overhead ## These are the files that `make clean' (and derivatives) will remove from ## this directory. |