diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2005-08-08 07:32:27 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2005-08-08 07:32:27 (GMT) |
| commit | ea15f348a1254b5a4ed3e8039f191a0430e4c3f2 (patch) | |
| tree | ae53534ce7bc8e02850e0ef63a3393a963dcb2c2 | |
| parent | a0f06d0961d612588e700eef40eaaf5db7e63094 (diff) | |
| download | hdf5-ea15f348a1254b5a4ed3e8039f191a0430e4c3f2.zip hdf5-ea15f348a1254b5a4ed3e8039f191a0430e4c3f2.tar.gz hdf5-ea15f348a1254b5a4ed3e8039f191a0430e4c3f2.tar.bz2 | |
[svn-r11208] Purpose:
Bug fix and code minor cleanup.
Description:
The attempt to redirect stderr together to the log files were
done in the wrong order such that stderr output goes to where
stdout WAS. Fixed that.
Code minor cleanup--use shell variables to hold the name of the
log file and the test instead of generating them repeatedly. This
makes easier code reading, less crowded and avoid typos.
Only conclude.in is changed. The Makefile.in changes are all
derived from automake.
Platforms tested:
h5committested.
30 files changed, 1845 insertions, 1603 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 5a82a61..4d15f60 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -731,69 +731,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 6b8e0c8..b878739 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -643,69 +643,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 2a9f34a..60276ee 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -927,69 +927,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 8f2b8ad..f55e2a7 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -897,69 +897,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 743a7ff..7696cdd 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -658,69 +658,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/Makefile.in b/hl/Makefile.in index 03c3e5c..4415979 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -698,69 +698,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 7a485f2..ced9341 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -701,69 +701,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 703f190..2462603 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -722,69 +722,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 5b48b45..6aae155 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -670,69 +670,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 21822bc..4c73b43 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -696,69 +696,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 937ffc5..833cb24 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -743,69 +743,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 8f58ab2..4572802 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -660,69 +660,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index d68add5..4d4752c 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -710,69 +710,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index d0dd082..d0df0ef 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -693,69 +693,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 3e8af3c..b4834c9 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -704,69 +704,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/perform/Makefile.in b/perform/Makefile.in index de02a35..6245aad 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -763,69 +763,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/src/Makefile.in b/src/Makefile.in index 4390d58..017f19b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1022,69 +1022,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/test/Makefile.in b/test/Makefile.in index 732d650..c9ccc2c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1122,69 +1122,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/testpar/Makefile.am b/testpar/Makefile.am index 92985b8..d1ecb25 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -24,7 +24,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. # -TEST_PROG_PARA=t_mpi t_fphdf5 testphdf5 +TEST_PROG_PARA=t_mpi t_fphdf5 testphdf5 t_chunk_alloc TEST_SCRIPT_PARA=testph5.sh check_PROGRAMS = $(TEST_PROG_PARA) diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 0ff5980..5433d60 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -29,7 +29,7 @@ # # hdf5 Parallel Library Test Makefile(.in) # -SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) +SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -65,12 +65,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = testph5.sh -am__EXEEXT_1 = t_mpi$(EXEEXT) t_fphdf5$(EXEEXT) testphdf5$(EXEEXT) +am__EXEEXT_1 = t_mpi$(EXEEXT) t_fphdf5$(EXEEXT) testphdf5$(EXEEXT) \ + t_chunk_alloc$(EXEEXT) +t_chunk_alloc_SOURCES = t_chunk_alloc.c +t_chunk_alloc_OBJECTS = t_chunk_alloc.$(OBJEXT) +t_chunk_alloc_LDADD = $(LDADD) +am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la +am__DEPENDENCIES_2 = $(top_builddir)/test/libh5test.la +t_chunk_alloc_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) t_fphdf5_SOURCES = t_fphdf5.c t_fphdf5_OBJECTS = t_fphdf5.$(OBJEXT) t_fphdf5_LDADD = $(LDADD) -am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la -am__DEPENDENCIES_2 = $(top_builddir)/test/libh5test.la t_fphdf5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) t_mpi_SOURCES = t_mpi.c t_mpi_OBJECTS = t_mpi.$(OBJEXT) @@ -93,8 +99,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) -DIST_SOURCES = t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) +SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) +DIST_SOURCES = t_chunk_alloc.c t_fphdf5.c t_mpi.c $(testphdf5_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -326,7 +332,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. # -TEST_PROG_PARA = t_mpi t_fphdf5 testphdf5 +TEST_PROG_PARA = t_mpi t_fphdf5 testphdf5 t_chunk_alloc TEST_SCRIPT_PARA = testph5.sh check_SCRIPTS = $(TEST_SCRIPT) testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c \ @@ -396,6 +402,9 @@ clean-checkPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +t_chunk_alloc$(EXEEXT): $(t_chunk_alloc_OBJECTS) $(t_chunk_alloc_DEPENDENCIES) + @rm -f t_chunk_alloc$(EXEEXT) + $(LINK) $(t_chunk_alloc_LDFLAGS) $(t_chunk_alloc_OBJECTS) $(t_chunk_alloc_LDADD) $(LIBS) t_fphdf5$(EXEEXT): $(t_fphdf5_OBJECTS) $(t_fphdf5_DEPENDENCIES) @rm -f t_fphdf5$(EXEEXT) $(LINK) $(t_fphdf5_LDFLAGS) $(t_fphdf5_OBJECTS) $(t_fphdf5_LDADD) $(LIBS) @@ -412,6 +421,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_chunk_alloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_coll_chunk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_dset.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_file.Po@am__quote@ @@ -701,69 +711,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/Makefile.in b/tools/Makefile.in index 36ed707..9d76058 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -703,69 +703,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 3e8af3c..b4834c9 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -704,69 +704,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 06722a1..1d2b8f6 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -741,69 +741,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index e75b4cb..3d20448 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -716,69 +716,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 2c78396..5e921ac 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -711,69 +711,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index bd655c5..2d5b1fa 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -737,69 +737,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 792f78f..d0c9298 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -691,69 +691,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index d97ebb9..d4588f7 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -766,69 +766,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 6eed94e..61b65d1 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -708,69 +708,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 59f0708..1d21a6a 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -799,69 +799,77 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The dummy.chkexe here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \ - echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ - else \ - echo "============================" > $(@:.chkexe_=.log); \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\ - else \ - echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \ - fi; \ - echo "============================" >> $(@:.chkexe_=.log); \ - srcdir="$(srcdir)" \ - $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \ - && touch $(@:.chkexe_=.chkexe) || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat $(@:.chkexe_=.log) && false) || exit 1; \ - echo "" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \ - echo "============================" >> $(@:.chkexe_=.log); \ - echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=$(@:.chkexe_=)$(EXEEXT);\ + log=$(@:.chkexe_=.log); \ + echo "============================"; \ + if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + srcdir="$(srcdir)" \ + $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch $(@:.chkexe_=.chkexe) || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # The dummy.chksh here prevents the target from being # empty if there are no tests in the current directory. +# $${log} is the log file. +# $${tname} is the name of test. $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ - echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ - echo "No need to test `basename $(@:.chksh_=)` again."; \ - else \ - echo "============================" > `basename $(@:.chksh_=.logsh)`; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \ - else \ - echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \ - fi; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ - srcdir="$(srcdir)" \ - $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \ - && touch `basename $(@:.chksh_=.chksh)` || \ - (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ - (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \ - echo "" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \ - echo "============================" >> `basename $(@:.chksh_=.logsh)`; \ - echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ - fi; \ - echo "============================"; \ + tname=`basename $(@:.chksh_=)`;\ + log=`basename $(@:.chksh_=.logsh)`; \ + echo "============================"; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test $${tname} again."; \ + else \ + echo "============================" > $${log}; \ + if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + elif test "X$(HDF_CXX)" = "Xyes"; then \ + echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ + echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + else \ + echo "Testing $${tname} $(TEST_FLAGS)"; \ + echo "$${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ + fi; \ + echo "============================" >> $${log}; \ + RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ + srcdir="$(srcdir)" \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \ + && touch `basename $(@:.chksh_=.chksh)` || \ + (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ + (cat $${log} && false) || exit 1; \ + echo "" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)" >> $${log}; \ + echo "============================" >> $${log}; \ + echo "Finished testing $${tname} $(TEST_FLAGS)"; \ + fi; \ + echo "============================"; \ fi # Actual execution of check-p. |