diff options
Diffstat (limited to 'tools/h5diff')
-rw-r--r-- | tools/h5diff/Makefile.in | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 2c09406..5bcc9be 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -686,9 +686,11 @@ 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 \ @@ -709,6 +711,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" \ @@ -738,7 +768,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 \ @@ -758,8 +788,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 |