diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2009-10-22 21:18:39 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2009-10-22 21:18:39 (GMT) |
| commit | 5f7c4466329c36ecc1e831c9565a3ed56db13efa (patch) | |
| tree | 939a529ded3a8fa10d45e11fa12edc540a21e0e3 | |
| parent | 7d30f46933f41c07db468090cf13ba2aa6e56c18 (diff) | |
| download | hdf5-5f7c4466329c36ecc1e831c9565a3ed56db13efa.zip hdf5-5f7c4466329c36ecc1e831c9565a3ed56db13efa.tar.gz hdf5-5f7c4466329c36ecc1e831c9565a3ed56db13efa.tar.bz2 | |
[svn-r17725] Bug fix:
There was a mixed use of $RUNTEST and $RUNTESTS. Both of them
meant for the same thing, the launching command of executables.
$RUNTEST was used from the beginning (old v1.4.* versions used
$RUNTEST). Somehow, v1.8 started to use $RUNTESTS and this was
later propogated back to v1.6.8 and on.
After discussing with Mike M., we agree to use the original
$RUNTEST.
test: Up. (before the fix, I could not propage a launch command
into test/h5repack's "gmake check". After the fix, I could.
| -rw-r--r-- | c++/config/conclude.in | 4 | ||||
| -rw-r--r-- | config/conclude.in | 4 | ||||
| -rw-r--r-- | fortran/config/conclude.in | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/c++/config/conclude.in b/c++/config/conclude.in index 89c2086..256f5d7 100644 --- a/c++/config/conclude.in +++ b/c++/config/conclude.in @@ -93,7 +93,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "============================" >> $${log}; \ srcdir="$(srcdir)" \ - $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(RUNTEST) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -165,7 +165,7 @@ _check-p: $(LIB) $(PROGS) $(TESTS) @for test in $(TEST_PROGS_PARA) dummy; do \ if test $$test != dummy; then \ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \ - RUNTESTS="$(RUNPARALLEL)" || exit 1; \ + RUNTEST="$(RUNPARALLEL)" || exit 1; \ fi; \ done @for test in $(TEST_SCRIPTS_PARA) dummy; do \ diff --git a/config/conclude.in b/config/conclude.in index 0568f13..500032b 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -104,7 +104,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "============================" >> $${log}; \ srcdir="$(srcdir)" \ - $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(RUNTEST) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -175,7 +175,7 @@ _check-p: $(LIB) $(PROGS) $(TESTS) @for test in $(TEST_PROGS_PARA) dummy; do \ if test $$test != dummy; then \ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \ - RUNTESTS="$(RUNPARALLEL)" || exit 1; \ + RUNTEST="$(RUNPARALLEL)" || exit 1; \ fi; \ done @for test in $(TEST_SCRIPTS_PARA) dummy; do \ diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in index 188b2f0..105b4d7 100644 --- a/fortran/config/conclude.in +++ b/fortran/config/conclude.in @@ -89,7 +89,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "============================" >> $${log}; \ srcdir="$(srcdir)" \ - $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(RUNTEST) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -160,7 +160,7 @@ _check-p: $(LIB) $(PROGS) $(TESTS) @for test in $(TEST_PROGS_PARA) dummy; do \ if test $$test != dummy; then \ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \ - RUNTESTS="$(RUNPARALLEL)" || exit 1; \ + RUNTEST="$(RUNPARALLEL)" || exit 1; \ fi; \ done @for test in $(TEST_SCRIPTS_PARA) dummy; do \ |