summaryrefslogtreecommitdiffstats
path: root/tools/misc
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-08-01 22:22:55 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-08-01 22:22:55 (GMT)
commitc63ef2cba28df827eb090a019284c7cd8c2982af (patch)
tree134ff7254d8ee7b1c6f7fa3eabc509528899d68d /tools/misc
parentf2240792704b74fc288b4e4a570509c4afe4a34e (diff)
downloadhdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.zip
hdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.tar.gz
hdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.tar.bz2
[svn-r11179] Purpose:
Feature: check-clean target Description: 'make check-clean' cleans up output files from tests. Solution: Tests create foo.chkexe and foo.log files. Scripts create foo.chksh and foo.logsh files. 'make check-clean' will clean these files up so that the tests can be re-run. Also suppressed some not-very-useful output of Makefiles when it would echo commands. Platforms tested: mir, sleipnir, modi4 Misc. update:
Diffstat (limited to 'tools/misc')
-rw-r--r--tools/misc/Makefile.am6
-rw-r--r--tools/misc/Makefile.in28
2 files changed, 21 insertions, 13 deletions
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 3e2e173..daf2323 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -61,12 +61,12 @@ else
endif
install-exec-local:
- $(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+ @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
uninstall-local:
- $(RM) $(bindir)/$(H5CC_NAME)
+ @$(RM) $(bindir)/$(H5CC_NAME)
# How to build h5redeploy script
h5redeploy: h5redeploy.in
- cp $(srcdir)/$@.in $@
+ @cp $(srcdir)/$@.in $@
include $(top_srcdir)/config/conclude.am
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 0f0eded..8ff5389 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -329,16 +329,20 @@ H5FC_PP = $(bindir)/h5pfc
# 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.
+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
+
# Temporary files. *.h5 are generated by h5repart_gentest. They should
# copied to the testfiles/ directory if update is required. fst_family*.h5
# and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 \
../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
# Include src directory
@@ -721,13 +725,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
check-install: installcheck
install-exec-local:
- $(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+ @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
uninstall-local:
- $(RM) $(bindir)/$(H5CC_NAME)
+ @$(RM) $(bindir)/$(H5CC_NAME)
# How to build h5redeploy script
h5redeploy: h5redeploy.in
- cp $(srcdir)/$@.in $@
+ @cp $(srcdir)/$@.in $@
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
@@ -737,7 +741,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -757,6 +761,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.