diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2010-01-12 23:58:30 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2010-01-12 23:58:30 (GMT) |
| commit | 22da4232a4693e3f0a4ee2f37053f85a28e885fd (patch) | |
| tree | a11316a3484f0736e0700ff9d81f0fc9477a1d4b /test | |
| parent | 4e8e0a55a5b618f343c0959622bf19a79f457a27 (diff) | |
| download | hdf5-22da4232a4693e3f0a4ee2f37053f85a28e885fd.zip hdf5-22da4232a4693e3f0a4ee2f37053f85a28e885fd.tar.gz hdf5-22da4232a4693e3f0a4ee2f37053f85a28e885fd.tar.bz2 | |
[svn-r18107] bug 1673:
The mixed use of RUNTEST (original) and RUNTESTS (new) caused
confusion. E.g., the timings in test/ was still using the old
$RUNTEST. It made more sense to use $RUNTEST which is used
by the dejagnu feature of automake. So, I changed all
$RUNTEST or $RUNTESTS to $RUNEXEC.
config/commence.am & config/conclude.am are the two files
that got changes. Also fixed an error in test/Makefile.am.
The rest are changed by bin/reconfigure.
Tested: h5committested.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index ec1eed7..5a33c82 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -90,7 +90,7 @@ timings _timings: testmeta @for timing in $(TIMINGS) dummy; do \ if test $$timing != dummy; then \ echo "Running $$timing $(TEST_FLAGS)"; \ - $(RUNTEST) ./$$timing $(TEST_FLAGS) || exit 1; \ + $(RUNEXEC) ./$$timing $(TEST_FLAGS) || exit 1; \ fi; \ done; diff --git a/test/Makefile.in b/test/Makefile.in index 0f8adca..ed4cfac 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -624,12 +624,12 @@ CP = cp # Some machines need a command to run executables; this is that command # so that our tests will run. -# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# We use RUNEXEC instead of RUNSERIAL directly because it may be that # some tests need to be run with a different command. Older versions # of the makefiles used the command # $(LIBTOOL) --mode=execute # in some directories, for instance. -RUNTESTS = $(RUNSERIAL) +RUNEXEC = $(RUNSERIAL) # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la @@ -1366,7 +1366,7 @@ timings _timings: testmeta @for timing in $(TIMINGS) dummy; do \ if test $$timing != dummy; then \ echo "Running $$timing $(TEST_FLAGS)"; \ - $(RUNTEST) ./$$timing $(TEST_FLAGS) || exit 1; \ + $(RUNEXEC) ./$$timing $(TEST_FLAGS) || exit 1; \ fi; \ done; @@ -1473,7 +1473,7 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: fi; \ echo "============================" >> $${log}; \ srcdir="$(srcdir)" \ - $(TIME) $(RUNTESTS) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ + $(TIME) $(RUNEXEC) ./$${tname} $(TEST_FLAGS) >> $${log} 2>&1 \ && touch $(@:.chkexe_=.chkexe) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ (cat $${log} && false) || exit 1; \ @@ -1544,7 +1544,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS) @for test in $(TEST_PROG_PARA) dummy; do \ if test $$test != dummy; then \ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_ \ - RUNTESTS="$(RUNPARALLEL)" || exit 1; \ + RUNEXEC="$(RUNPARALLEL)" || exit 1; \ fi; \ done @for test in $(TEST_SCRIPT_PARA) dummy; do \ |