[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

10 files changed, 527 insertions, 151 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 95b14cf..4d5182e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -282,7 +282,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)
+
 
 # All subdirectories
 SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
@@ -615,16 +624,24 @@ uninstall-info: uninstall-info-recursive
 	tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -636,6 +653,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -664,8 +683,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -673,26 +699,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -700,21 +732,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 20ff80b..b5b639d 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -305,7 +305,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)
+
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -618,16 +627,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -639,6 +656,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -667,8 +686,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -676,26 +702,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -703,21 +735,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index accb120..b5e7c41 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -313,10 +313,19 @@ 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)!
 
 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
-MOSTLYCLEANFILES = *.chkexe *.chksh *.h5 expect_sorted actual_sorted
+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 expect_sorted \
+	actual_sorted
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -656,16 +665,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-binPROGRAMS uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -677,6 +694,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -705,8 +724,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -714,26 +740,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -741,21 +773,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index fd8d44e..f8d1b96 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -306,10 +306,18 @@ 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)!
 
 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = *.chkexe *.chksh *.h5
+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
 
 # Include files in /src directory and /tools/lib directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -632,16 +640,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-binPROGRAMS uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -653,6 +669,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -681,8 +699,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -690,26 +715,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -717,21 +748,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 0e501c4..4f1a039 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -306,7 +306,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)
+
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -625,16 +634,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-binPROGRAMS uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -646,6 +663,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -674,8 +693,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -683,26 +709,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -710,21 +742,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index d8054b0..6d0c4a7 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -301,7 +301,15 @@ H5FC = $(bindir)/h5fc
 H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe and .chksh files are used to mark tests that have run successfully.
-MOSTLYCLEANFILES = *.chkexe *.chksh *.h5 *.txt
+# 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) *.h5 *.txt
 
 #
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -649,16 +657,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-binPROGRAMS uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -670,6 +686,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -698,8 +716,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -707,26 +732,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -734,21 +765,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 838665f..37187e3 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -299,7 +299,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)
+
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -605,16 +614,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -626,6 +643,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -654,8 +673,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -663,26 +689,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -690,21 +722,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 8bbfaf0..cc8452c 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -321,10 +321,18 @@ 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)!
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = *.chkexe *.chksh *.h5
+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
 
 # Include src, test, and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@@ -682,16 +690,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -703,6 +719,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -731,8 +749,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -740,26 +765,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -767,21 +798,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index b3ed9cd..8509c3d 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -303,7 +303,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)
+
 
 # Include files in /src directory
 INCLUDES = -I$(top_srcdir)/src
@@ -622,16 +631,24 @@ uninstall-am: uninstall-info-am
 	tags uninstall uninstall-am uninstall-info-am
 
 
+# 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
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -643,6 +660,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -671,8 +690,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -680,26 +706,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -707,21 +739,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 1dad6ab..0f0eded 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -326,12 +326,20 @@ 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)!
 
 # 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 = *.chkexe *.chksh *.h5 ../testfiles/fst_family*.h5 \
-	../testfiles/scd_family*.h5
+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 \
+	../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
 
 # Include src directory
 INCLUDES = -I$(top_srcdir)/src
@@ -706,6 +714,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	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
+
 install-exec-local:
 	$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
 uninstall-local:
@@ -717,14 +731,16 @@ h5redeploy: h5redeploy.in
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
-build-lib: $(LIB)
-build-progs: $(LIB) $(PROGS)
-build-tests: $(LIB) $(PROGS) $(TESTS)
+# BUILT_SOURCES contain targets that need to be built before anything else
+# in the directory (e.g., Fortran type detection)
+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 ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
-	    if test $$d != X -a $$d != .; then                                \
+	    if test $$d != X && test $$d != .; then                           \
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
@@ -736,6 +752,8 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 
 # make install-doc doesn't do anything outside of doc directory, but
 # Makefiles should recognize it.
+# UPDATE: docs no longer reside in this build tree, so this target
+# is depreciated.
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
@@ -764,8 +782,15 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 	fi
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
+	@for d in dummy $(TEST_PROG_CHKEXE:.chkexe_=.log)            \
+	          $(TEST_SCRIPT_CHKSH:.chksh_=.logsh); do            \
+	   if test $$d != dummy && test $$d != .log &&               \
+	                           test $$d != .logsh; then          \
+	      cat `basename $$d`;                                    \
+	   fi;                                                       \
+	done
 
-# The .chkexe_ here is the "dummy" that prevents the target from being
+# The dummy.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
@@ -773,26 +798,32 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	  if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $(@:.chkexe_=)$(EXEEXT); then \
 	    echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \
 	  else \
+	    echo "============================" > $(@:.chkexe_=.log); \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "Fortran API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "C++ API: $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log);\
 	    else \
 	      echo "Testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
+	      echo "$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) Test Log" >> $(@:.chkexe_=.log); \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    srcdir="$(srcdir)" \
-	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) \
+	      $(RUNTESTS) ./$(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS) 2>&1 >> $(@:.chkexe_=.log) \
 	      && touch $(@:.chkexe_=.chkexe) || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat $(@:.chkexe_=.log) && false) || exit 1; \
+	    echo "" >> $(@:.chkexe_=.log); \
+	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)" >> $(@:.chkexe_=.log); \
+	    echo "============================" >> $(@:.chkexe_=.log); \
 	    echo "Finished testing $(@:.chkexe_=)$(EXEEXT) $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \
 	fi
 
-# The .chksh_ here is the "dummy" that prevents the target from being
+# The dummy.chksh here prevents the target from being
 # empty if there are no tests in the current directory.
 $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
@@ -800,21 +831,27 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	  if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
 	    echo "No need to test `basename $(@:.chksh_=)` again."; \
 	  else \
+	    echo "============================" > `basename $(@:.chksh_=.logsh)`; \
 	    if test "X$(HDF_FORTRAN)" = "Xyes"; then \
 	      echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "Fortran API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    elif test "X$(HDF_CXX)" = "Xyes"; then \
 	      echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "C++ API: `basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `baename $(@:.chksh_=.logsh)`; \
 	    else \
 	      echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
+	      echo "`basename $(@:.chksh_=)` $(TEST_FLAGS) Test Log" >> `basename $(@:.chksh_=.logsh)`; \
 	    fi; \
-	    echo "============================"; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	    srcdir="$(srcdir)" \
-	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \
+	      $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) 2>&1 >> `basename $(@:.chksh_=.logsh)` \
 	      && touch `basename $(@:.chksh_=.chksh)` || \
 	      (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
-	      exit 1; \
-	    echo ""; \
+	      (cat `basename $(@:.chksh_=.logsh)` && false) || exit 1; \
+	    echo "" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)" >> `basename $(@:.chksh_=.logsh)`; \
+	    echo "============================" >> `basename $(@:.chksh_=.logsh)`; \
 	    echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \
 	  fi; \
 	  echo "============================"; \