From 4cf99e9f288d42bc756f1585c72ad584620fdec9 Mon Sep 17 00:00:00 2001 From: James Laird Date: Fri, 1 Jul 2005 16:22:05 -0500 Subject: [svn-r11013] Purpose: Bug fix Description: Fixed bugs that caused tests to be unable to find testhdf5.sh during daily tests, and another that broke sol and shanti. Solution: When tests are run, their path is ./$testname . When scripts are run, their path has no leading "./". Fixed. Sol and shanti don't recognize the -e option for test, but they do know -f. Fixed. Also modified release notes. Platforms tested: mir, shanti, heping --- c++/Makefile.in | 14 +++++++------- c++/examples/Makefile.in | 14 +++++++------- c++/src/Makefile.in | 14 +++++++------- c++/test/Makefile.in | 14 +++++++------- config/conclude.am | 14 +++++++------- examples/Makefile.in | 14 +++++++------- fortran/Makefile.in | 14 +++++++------- fortran/examples/Makefile.in | 14 +++++++------- fortran/src/Makefile.in | 14 +++++++------- fortran/test/Makefile.in | 14 +++++++------- fortran/testpar/Makefile.in | 14 +++++++------- hl/Makefile.in | 14 +++++++------- hl/c++/Makefile.in | 14 +++++++------- hl/c++/src/Makefile.in | 14 +++++++------- hl/c++/test/Makefile.in | 14 +++++++------- hl/fortran/Makefile.in | 14 +++++++------- hl/fortran/src/Makefile.in | 14 +++++++------- hl/fortran/test/Makefile.in | 14 +++++++------- hl/src/Makefile.in | 14 +++++++------- hl/test/Makefile.in | 14 +++++++------- hl/tools/gif2h5/Makefile.in | 14 +++++++------- perform/Makefile.in | 14 +++++++------- release_docs/RELEASE.txt | 6 ++++++ src/Makefile.in | 14 +++++++------- test/Makefile.in | 14 +++++++------- testpar/Makefile.in | 14 +++++++------- tools/Makefile.in | 14 +++++++------- tools/gifconv/Makefile.in | 14 +++++++------- tools/h5diff/Makefile.in | 14 +++++++------- tools/h5dump/Makefile.in | 14 +++++++------- tools/h5import/Makefile.in | 14 +++++++------- tools/h5jam/Makefile.in | 14 +++++++------- tools/h5ls/Makefile.in | 14 +++++++------- tools/h5repack/Makefile.in | 14 +++++++------- tools/lib/Makefile.in | 14 +++++++------- tools/misc/Makefile.in | 14 +++++++------- 36 files changed, 251 insertions(+), 245 deletions(-) diff --git a/c++/Makefile.in b/c++/Makefile.in index 971b8f5..93ae380 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -688,10 +688,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -716,10 +716,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -733,7 +733,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index dec6475..c32ffae 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -579,10 +579,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -607,10 +607,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -624,7 +624,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 14b13a0..8ad24cf 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -766,10 +766,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -794,10 +794,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -811,7 +811,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 7a39216..c90de39 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -654,10 +654,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -682,10 +682,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -699,7 +699,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/config/conclude.am b/config/conclude.am index f5e48b9..01c8bb8 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -71,10 +71,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -99,10 +99,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -116,7 +116,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/examples/Makefile.in b/examples/Makefile.in index 933da40..9d631ad 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -594,10 +594,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -622,10 +622,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -639,7 +639,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 4a25eb6..bb87fe1 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -697,10 +697,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -725,10 +725,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -742,7 +742,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 0f540dd..a214edf 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -597,10 +597,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -625,10 +625,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -642,7 +642,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index dc7bf96..2aa76cd 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -894,10 +894,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -922,10 +922,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -939,7 +939,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index e2bf231..9ee6981 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -859,10 +859,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -887,10 +887,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -904,7 +904,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 0d8986f..f056a47 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -627,10 +627,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -655,10 +655,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -672,7 +672,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/Makefile.in b/hl/Makefile.in index 4d4ff34..7152cca 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -662,10 +662,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -690,10 +690,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -707,7 +707,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index c72b423..a4f6f4d 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -665,10 +665,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -693,10 +693,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -710,7 +710,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 4a1db55..9616d86 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -687,10 +687,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -715,10 +715,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -732,7 +732,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 9cee7ce..f5ff54b 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -636,10 +636,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -664,10 +664,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -681,7 +681,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index a23abca..f7ca3db 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -660,10 +660,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -688,10 +688,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -705,7 +705,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 7700a83..0c8021f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -711,10 +711,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -739,10 +739,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -756,7 +756,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 979832a..be1fb28 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -627,10 +627,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -655,10 +655,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -672,7 +672,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 659bdc7..dae01ac 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -675,10 +675,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -703,10 +703,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -720,7 +720,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 00dea35..95fa97e 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -661,10 +661,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -689,10 +689,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -706,7 +706,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 6cdaaac..ade4183 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -670,10 +670,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -698,10 +698,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -715,7 +715,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/perform/Makefile.in b/perform/Makefile.in index e8fbf26..3d22c65 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -729,10 +729,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -757,10 +757,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -774,7 +774,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 1510e41..2b00621 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -36,6 +36,12 @@ New Features Configuration: -------------- + - When make is invoked in parallel (using -j), sequential tests + are now executed simultaneously. This should make them execute + more quickly on some machines. + Also, when tests pass, they will create a foo.chkexe file. + This prevents the test from executing again until the test or + main library changes. - On windows, all.zip is deprecated. users should read INSTALL_Windows.txt to know the details. Reasons to deprecate all.zip: diff --git a/src/Makefile.in b/src/Makefile.in index e8954ca..b5ceba6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -979,10 +979,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -1007,10 +1007,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -1024,7 +1024,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/test/Makefile.in b/test/Makefile.in index 9c1cec7..94c8887 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1085,10 +1085,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -1113,10 +1113,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -1130,7 +1130,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index c54fa6a..66d3885 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -666,10 +666,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -694,10 +694,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -711,7 +711,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/Makefile.in b/tools/Makefile.in index 69fdb92..bcbe036 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -667,10 +667,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -695,10 +695,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -712,7 +712,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 6cdaaac..ade4183 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -670,10 +670,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -698,10 +698,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -715,7 +715,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 27606ff..bf38e6d 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -708,10 +708,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -736,10 +736,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -753,7 +753,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 50d6ece..0ddb4b4 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -684,10 +684,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -712,10 +712,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -729,7 +729,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index b9333e6..edcc1f4 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -677,10 +677,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -705,10 +705,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -722,7 +722,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 12a6f6e..87e9e3e 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -701,10 +701,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -729,10 +729,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -746,7 +746,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index e3582a0..2d464e0 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -657,10 +657,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -685,10 +685,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -702,7 +702,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index d067667..3d2635a 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -734,10 +734,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -762,10 +762,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -779,7 +779,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index bced05d..7a7ff20 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -674,10 +674,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -702,10 +702,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -719,7 +719,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 21806d2..dd54f02 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -767,10 +767,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -795,10 +795,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -812,7 +812,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ -- cgit v0.12