summaryrefslogtreecommitdiffstats
path: root/tools/h5import/Makefile.in
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2005-09-29 05:17:06 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2005-09-29 05:17:06 (GMT)
commit55c4f63df714fc947ed5b4312d8491baacc7a9ef (patch)
tree1501bcc1471e3b1a7d984dee4ad7ecfb92e5c7ea /tools/h5import/Makefile.in
parentbf9b7eb39c19757c220012c166a9b0dde9935482 (diff)
downloadhdf5-55c4f63df714fc947ed5b4312d8491baacc7a9ef.zip
hdf5-55c4f63df714fc947ed5b4312d8491baacc7a9ef.tar.gz
hdf5-55c4f63df714fc947ed5b4312d8491baacc7a9ef.tar.bz2
[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.
Diffstat (limited to 'tools/h5import/Makefile.in')
-rwxr-xr-xtools/h5import/Makefile.in15
1 files changed, 7 insertions, 8 deletions
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