summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.in57
1 files changed, 24 insertions, 33 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 57b95d7..cf071f4 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -492,33 +492,24 @@ H5CC_PP = $(bindir)/h5pcc
H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
-# .chkexe and .chksh files are used to mark tests that have run successfully.
-# Serial tests create .log and .logsh files. It's important only to clean log
-# files generated by HDF5's tests, because the .log suffix is used for
-# other files (e.g., config.log)!
-# On the other hand, it is very hard to specify the exact name of .chksh and
-# .logsh files because some scripts live in the source tree, not the build
-# tree. Thus, we clean all .logsh and .chksh files.
+# .chkexe files are used to mark tests that have run successfully.
+# .chklog files are output from those tests.
# Temporary files. These files are the ones created by setting the
# HDF5_NOCLEANUP environment variable and running `make test' without
# specifying a file prefix or low-level driver. Changing the file
# prefix or low-level driver with environment variables will influence
# the temporary file name in ways that the makefile is not aware of.
-CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) *.chksh *.logsh \
- cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
- tfile[1-4].h5 th5s[1-3].h5 lheap.h5 ohdr.h5 stab[1-2].h5 \
- extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
- dt_arith[1-2] links.h5 links[1-3].h5 big.data \
- big[0-9][0-9][0-9][0-9][0-9].h5 dtypes[1-8].h5 \
- dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 unlink.h5 \
- unicode.h5 fillval_[0-9].h5 fillval.raw mount_[0-9].h5 \
- testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 \
- tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 \
- tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
+CHECK_CLEANFILES = *.chkexe *.chklog cmpd_dset.h5 compact_dataset.h5 \
+ dataset.h5 extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 \
+ lheap.h5 ohdr.h5 stab[1-2].h5 extern_[1-3].h5 \
+ extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
+ links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
+ dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
+ unlink.h5 unicode.h5 fillval_[0-9].h5 fillval.raw \
+ mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
+ tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
+ tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
set_extent_create.h5 getname.h5 getname[1-3].h5 sec2_file.h5 \
family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
@@ -581,8 +572,8 @@ PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \
TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chksh_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chksh_)
+TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
+TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
all: all-am
.SUFFIXES:
@@ -1120,7 +1111,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
tname=$(@:.chkexe_=)$(EXEEXT);\
- log=$(@:.chkexe_=.log); \
+ log=$(@:.chkexe_=.chklog); \
echo "============================"; \
if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
echo "No need to test $${tname} again."; \
@@ -1151,16 +1142,16 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
echo "============================"; \
fi
-# The dummy.chksh here prevents the target from being
+# The dummysh.chkexe here prevents the target from being
# empty if there are no tests in the current directory.
# $${log} is the log file.
# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
- @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
- tname=`basename $(@:.chksh_=)`;\
- log=`basename $(@:.chksh_=.logsh)`; \
+$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
+ @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
+ tname=`basename $(@:.chkexe_=)`;\
+ log=`basename $(@:.chkexe_=.chklog)`; \
echo "============================"; \
- if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
+ if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
echo "No need to test $${tname} again."; \
else \
echo "============================" > $${log}; \
@@ -1177,8 +1168,8 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
echo "============================" >> $${log}; \
RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \
srcdir="$(srcdir)" \
- $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \
- && touch `basename $(@:.chksh_=.chksh)` || \
+ $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+ && touch `basename $(@:.chkexe_=.chkexe)` || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
echo "" >> $${log}; \
@@ -1214,7 +1205,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
test $$test = dummy || false
@for test in $(TEST_SCRIPT_PARA) dummy; do \
if test $$test != dummy; then \
- $(MAKE) $(AM_MAKEFLAGS) $$test.chksh_; \
+ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
fi; \
done; \
test $$test = dummy || false