diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-08-01 22:22:55 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-08-01 22:22:55 (GMT) |
| commit | c63ef2cba28df827eb090a019284c7cd8c2982af (patch) | |
| tree | 134ff7254d8ee7b1c6f7fa3eabc509528899d68d /config | |
| parent | f2240792704b74fc288b4e4a570509c4afe4a34e (diff) | |
| download | hdf5-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 'config')
| -rw-r--r-- | config/commence.am | 12 | ||||
| -rw-r--r-- | config/conclude.am | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/config/commence.am b/config/commence.am index fc13cfb..3325efb 100644 --- a/config/commence.am +++ b/config/commence.am @@ -57,12 +57,16 @@ AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf # 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)! -MOSTLYCLEANFILES=$(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ +# 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_SCRIPT_CHKSH:.chksh_=.chksh) \ - $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \ $(TEST_PROG_CHKEXE:.chkexe_=.log) \ - $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) + $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ + *.chksh *.logsh + +MOSTLYCLEANFILES=$(CHECK_CLEANFILES) # check-install is a synonym for installcheck. # Add this build rule here (rather than in conclude.am, where build rules diff --git a/config/conclude.am b/config/conclude.am index 9553fce..4204d74 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -22,7 +22,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 \ @@ -42,6 +42,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. |