[svn-r11095] Purpose:

Configuration feature

Description:
Serial test output is now stored in log files and printed when all tests
in a directory complete, or when a test fails.  This should make test output
more readable and useful.
Also made changes to clean up ii_files directories that are created by some
C++ compilers/linkers.
Also fixed a few minor Makefile bugs.

Solution:
When serial tests run, their output is saved in *.log or *.logsh.  While
running, tests only print when they begin and when they complete; their
more specific output (from the log file) is printed if the test fails or
when all tests have completed.
Comments welcome.

Platforms tested:
mir, modi4 (parallel and serial), copper, shanti

1 files changed, 22 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index a61a837..50f5e18 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -311,7 +311,16 @@ H5FC = $(bindir)/h5fc
 H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe and .chksh files are used to mark tests that have run successfully.
-MOSTLYCLEANFILES = *.chkexe *.chksh
+# 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)                    \
+        $(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)
+
 @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = 
 
 # Define subdirectories to build.
@@ -758,6 +767,12 @@ uninstall-info: uninstall-info-recursive
 	uninstall-info-am uninstall-local
 
 
+# check-install is a synonym for installcheck.
+# Add this build rule here (rather than in conclude.am, where build rules
+# normally go) because it should be included in the top-level Makefile.am
+# as well.
+check-install: installcheck
+
 # Define rules for lib, progs, check, and tests.
 # These simply involve recursing into subdirectories.
 test _test: check
@@ -793,12 +808,17 @@ clean-local:
 	  fi;                                                           \
 	done
 
+# Some C++ compilers/linkers will create a directory named ii_files in
+# the root directory, which should be cleaned.
 mostlyclean-local:
 	@@SETX@; for d in examples perform; do                          \
 	  if test -f $$d/Makefile; then                                 \
 	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1;  \
 	  fi;                                                           \
-	done
+	done;                                                           \
+	if test -d ii_files; then                                       \
+          $(RM) -rf ii_files;                                           \
+        fi
 
 # 'make install-all' also installs examples
 install-all:
@@ -823,9 +843,6 @@ uninstall-doc:
 
 # `make check-install' or `make installcheck' checks that examples can 
 #  be successfully built
-check-install:
-	$(MAKE) $(AM_MAKEFLAGS) installcheck
-
 installcheck-local:
 	(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;