[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

10 files changed, 70 insertions, 70 deletions

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; \