[svn-r11478] Purpose:

bug fix.

Description:
When a parallel test script test fails, make would continue because the
way it was setup inside a for loop.  Fixed it by issuing an exit 1 inside
the loop.

There was also a typo error in the newer command comparision that it
must be $${chkname} in order to be valid.  Also, the test script itself
was not checked in the newer lists.  All fixed.

Platforms tested:
h5committested and also hand tested in heping pp mode.

10 files changed, 70 insertions, 80 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 1efcd9c..e90fc39 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -741,11 +741,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -762,7 +763,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -795,14 +796,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 9a5d84e..edaac3b 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -742,11 +742,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -763,7 +764,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -796,14 +797,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 61b92b6..e2fdbd7 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -782,11 +782,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -803,7 +804,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -836,14 +837,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index da8585d..bde67d4 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -757,11 +757,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -778,7 +779,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -811,14 +812,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 2e9710e..f756fed 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -750,11 +750,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -771,7 +772,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -804,14 +805,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 55ee807..e82fa35 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -777,11 +777,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -798,7 +799,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -831,14 +832,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index f8d6a6a..3f7c0b0 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -730,11 +730,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -751,7 +752,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -784,14 +785,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index d88de05..2c50f08 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -807,11 +807,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -828,7 +829,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -861,14 +862,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index cbb1725..9204dc8 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -740,11 +740,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -761,7 +762,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -794,14 +795,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index a8ccf1c..d2e7700 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -848,11 +848,12 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 # $${tname} is the name of test.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
-	   tname=`basename $(@:.chkexe_=)`;\
+	   cmd=$(@:.chkexe_=);\
+	   tname=`basename $$cmd`;\
 	   chkname=`basename $(@:.chkexe_=.chkexe)`;\
 	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer ${chkname} $(SCRIPT_DEPEND); then \
+	   if $(top_srcdir)/bin/newer $${chkname} $$cmd $(SCRIPT_DEPEND); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -869,7 +870,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(TIME) $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         $(TIME) $(SHELL) $$cmd $(TEST_FLAGS) >> $${log} 2>&1 \
 	         && touch $${chkname} || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
@@ -902,14 +903,12 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	      $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \
 	      RUNTESTS="$(RUNPARALLEL)"; \
 	   fi;                                                                \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ || exit 1; \
 	  fi;                                                                 \
-	done;                                                                 \
-	test $$test = dummy || false
+	done
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	    echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi