diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2001-09-11 04:56:54 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2001-09-11 04:56:54 (GMT) |
| commit | ebc3c0980a6ddd5a35cd74608a62114fa7a1b51f (patch) | |
| tree | c6a10e35b5ef57287b60ef9c1559df719c8c234f | |
| parent | 1ebf933310232f12e2c5e1e3a39efe3a3c6bcf15 (diff) | |
| download | hdf5-ebc3c0980a6ddd5a35cd74608a62114fa7a1b51f.zip hdf5-ebc3c0980a6ddd5a35cd74608a62114fa7a1b51f.tar.gz hdf5-ebc3c0980a6ddd5a35cd74608a62114fa7a1b51f.tar.bz2 | |
[svn-r4436] Purpose:
New feature.
Description:
Test programs were assumed to be serial programs only.
There was no provision to test parallel programs automatically.
Solution:
Added $(TEST_PARA_PROGS) to hold parallel test programs and
added appropriate action entry to test them if defined.
Platforms tested:
Eirene (parallel, serial).
| -rw-r--r-- | config/commence.in | 1 | ||||
| -rw-r--r-- | config/conclude.in | 17 | ||||
| -rw-r--r-- | perform/Makefile.in | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/config/commence.in b/config/commence.in index a05f9ed..e9d75cc 100644 --- a/config/commence.in +++ b/config/commence.in @@ -66,6 +66,7 @@ PUB_PROGS= PUB_DOCS= PROGS= TEST_PROGS= +TEST_PROGS_PARA= TEST_FLAGS= TEST_SCRIPTS= diff --git a/config/conclude.in b/config/conclude.in index 622cc65..7777a45 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -21,7 +21,7 @@ TAGS: $(LIB_SRC) ## Runs each test in order, passing $(TEST_FLAGS) to the program. ## 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 \ @@ -36,6 +36,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 "============================"; \ @@ -158,7 +171,7 @@ clean: mostlyclean (set -x; cd $$d; $(MAKE) $@) || exit 1; \ fi; \ done - -$(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN) + -$(RM) $(LIB) $(TEST_PROGS) $(TEST_PROGS_PARA) $(PROGS) $(CLEAN) -$(RM) -r .libs ## Like `clean' except it also removes files that were created by running diff --git a/perform/Makefile.in b/perform/Makefile.in index 8c63706..31c6149 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. @@ -33,7 +32,7 @@ TEST_SRC=iopipe.c chunk.c overhead.c \ TEST_OBJ=$(TEST_SRC:.c=.lo) ## How to build the programs... they all depend on the hdf5 library -$(TEST_PROGS): $(LIBHDF5) +$(TEST_PROGS) $(TEST_PROGS_PARA): $(LIBHDF5) perf: perf.lo @$(LT_LINK_EXE) $(CFLAGS) -o $@ perf.lo $(LIBH5TEST) $(LIBHDF5) \ |