[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:

3 files changed, 36 insertions, 15 deletions

diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index b5fb124..7da55eb 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -285,13 +285,16 @@ 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)!
-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)
 SUBDIRS = src test
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
@@ -636,7 +639,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                           \
@@ -656,6 +659,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.
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index e6b857f..2a20f72 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -307,13 +307,16 @@ 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)!
-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)
 
 # Include src directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@@ -658,7 +661,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                           \
@@ -678,6 +681,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.
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index efce9d9..53d499c 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -301,13 +301,16 @@ 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)!
-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)
 
 # Include directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
@@ -607,7 +610,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                           \
@@ -627,6 +630,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.