[svn-r11303] Purpose:

minor tidy up.

Description:
Changed both test programs and test scripts to use the same suffixes
(.chkexe and .chklog).  Changed from .log to .chklog to avoid running
into potential conflicts by other "things" (e.g., config.log).

Tested:
Heping.

2 files changed, 15 insertions, 24 deletions

diff --git a/config/commence.am b/config/commence.am
index 646d0bf..d2189c5 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -53,18 +53,9 @@ AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheade
 AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake
 AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
 
-# .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)!
-# 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
+# .chkexe files are used to mark tests that have run successfully.
+# .chklog files are output from those tests.
+CHECK_CLEANFILES=*.chkexe *.chklog
 
 # 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 5e0362b..88c7d3b 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -75,8 +75,8 @@ build-check-s: $(LIB) $(PROGS) $(TESTS)
 
 TEST_PROG_CHKEXE=$(TEST_PROG:=.chkexe_)
 TEST_PROG_PARA_CHKEXE=$(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH=$(TEST_SCRIPT:=.chksh_)
-TEST_SCRIPT_PARA_CHKSH=$(TEST_SCRIPT_PARA:=.chksh_)
+TEST_SCRIPT_CHKSH=$(TEST_SCRIPT:=.chkexe_)
+TEST_SCRIPT_PARA_CHKSH=$(TEST_SCRIPT_PARA:=.chkexe_)
 
 _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
 
@@ -87,7 +87,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
 $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
 	   tname=$(@:.chkexe_=)$(EXEEXT);\
-	   log=$(@:.chkexe_=.log); \
+	   log=$(@:.chkexe_=.chklog); \
 	   echo "============================"; \
 	   if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
 	      echo "No need to test $${tname} again."; \
@@ -118,16 +118,16 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	   echo "============================"; \
 	fi
  
-# The dummy.chksh here prevents the target from being
+# The dummysh.chkexe here prevents the target from being
 # empty if there are no tests in the current directory.
 # $${log} is the log file.
 # $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
-	@if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
-	   tname=`basename $(@:.chksh_=)`;\
-	   log=`basename $(@:.chksh_=.logsh)`; \
+$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
+	@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
+	   tname=`basename $(@:.chkexe_=)`;\
+	   log=`basename $(@:.chkexe_=.chklog)`; \
 	   echo "============================"; \
-	   if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
+	   if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
@@ -144,8 +144,8 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
 	      echo "============================" >> $${log}; \
 	      RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)"           \
 	      srcdir="$(srcdir)" \
-	         $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \
-	         && touch `basename $(@:.chksh_=.chksh)` || \
+	         $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+	         && touch `basename $(@:.chkexe_=.chkexe)` || \
 	         (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
 	         (cat $${log} && false) || exit 1; \
 	      echo "" >> $${log}; \
@@ -181,7 +181,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
 	test $$test = dummy || false
 	@for test in $(TEST_SCRIPT_PARA) dummy; do                           \
 	  if test $$test != dummy; then                                      \
-	    $(MAKE) $(AM_MAKEFLAGS) $$test.chksh_; \
+	    $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
 	  fi;                                                                 \
 	done;                                                                 \
 	test $$test = dummy || false