From a0f06d0961d612588e700eef40eaaf5db7e63094 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 8 Aug 2005 02:30:46 -0500 Subject: [svn-r11207] 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. Misc. update: --- c++/Makefile.in | 118 +++++++++++++++++++++++++---------------------- c++/examples/Makefile.in | 118 +++++++++++++++++++++++++---------------------- c++/src/Makefile.in | 118 +++++++++++++++++++++++++---------------------- c++/test/Makefile.in | 118 +++++++++++++++++++++++++---------------------- config/conclude.am | 118 +++++++++++++++++++++++++---------------------- examples/Makefile.in | 118 +++++++++++++++++++++++++---------------------- 6 files changed, 378 insertions(+), 330 deletions(-) diff --git a/c++/Makefile.in b/c++/Makefile.in index 29fa65f..42b78ee 100644 --- a/c++/Makefile.in +++ b/c++/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/c++/examples/Makefile.in b/c++/examples/Makefile.in index 5ba944b..fe74d83 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -619,69 +619,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/c++/src/Makefile.in b/c++/src/Makefile.in index 18846ec..b33082c 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -808,69 +808,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/c++/test/Makefile.in b/c++/test/Makefile.in index 1e0d6cb..333023c 100644 --- a/c++/test/Makefile.in +++ b/c++/test/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/config/conclude.am b/config/conclude.am index 6bde574..e0746a8 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -90,69 +90,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/examples/Makefile.in b/examples/Makefile.in index 427e89e..59d830a 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -633,69 +633,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. -- cgit v0.12