[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.

5 files changed, 35 insertions, 40 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 9bf7585..82352a3 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -759,11 +759,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}; \
@@ -780,7 +781,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; \
@@ -813,14 +814,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 56faf64..c6d1de3 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -681,11 +681,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}; \
@@ -702,7 +703,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; \
@@ -735,14 +736,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 973b1b4..a4fd5b3 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -967,11 +967,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}; \
@@ -988,7 +989,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; \
@@ -1021,14 +1022,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/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 169260e..846e0b8 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -906,11 +906,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}; \
@@ -927,7 +928,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; \
@@ -960,14 +961,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 88ff7c9..ce16200 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -701,11 +701,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}; \
@@ -722,7 +723,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; \
@@ -755,14 +756,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