summaryrefslogtreecommitdiffstats
path: root/tools/h5diff
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2010-01-12 23:57:44 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2010-01-12 23:57:44 (GMT)
commitccd0afac9b00aa2683ff72893c9c0d026f74f5c9 (patch)
tree57cfcb4c9700b54f7f03af5b7828826604415f4e /tools/h5diff
parent089d0ea9ad847230188d9009f4e015953bd4fea3 (diff)
downloadhdf5-ccd0afac9b00aa2683ff72893c9c0d026f74f5c9.zip
hdf5-ccd0afac9b00aa2683ff72893c9c0d026f74f5c9.tar.gz
hdf5-ccd0afac9b00aa2683ff72893c9c0d026f74f5c9.tar.bz2
[svn-r18106] 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 'tools/h5diff')
-rw-r--r--tools/h5diff/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 04a64da..e11ee1f 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -329,12 +329,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
@@ -860,7 +860,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; \
@@ -931,7 +931,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 \