[svn-r27290] Bring revisions #24622 - #24669 (i.e. #24624, #24663, #24669) from revise_chksum_retry branch to revise_chunks.

Tested on jam, koala, ostrich, platypus.

4 files changed, 23 insertions, 22 deletions

diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index dee1050..9e23dcc 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/config/commence.am
 AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 
 #test script and program
-TEST_PROG=h5repart_gentest talign h5clear_gentest
+TEST_PROG=h5repart_gentest talign
 TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh testh5clear.sh
 
 
@@ -36,6 +36,7 @@ SCRIPT_DEPEND=h5repart$(EXEEXT) h5mkgrp$(EXEEXT) h5clear$(EXEEXT)
 # These are our main targets, the tools
 bin_PROGRAMS=h5debug h5repart h5mkgrp h5clear
 bin_SCRIPTS=h5redeploy
+noinst_PROGRAMS=h5clear_gentest
 
 # Add h5debug, h5repart, and h5mkgrp specific linker flags here
 h5debug_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index d9b2ade..407cad6 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -106,6 +106,7 @@ check_PROGRAMS = $(am__EXEEXT_1) repart_test$(EXEEXT) \
 	clear_open_chk$(EXEEXT)
 bin_PROGRAMS = h5debug$(EXEEXT) h5repart$(EXEEXT) h5mkgrp$(EXEEXT) \
 	h5clear$(EXEEXT)
+noinst_PROGRAMS = h5clear_gentest$(EXEEXT)
 TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT)
 subdir = tools/misc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -119,9 +120,8 @@ CONFIG_CLEAN_FILES = h5cc testh5clear.sh testh5mkgrp.sh \
 	testh5repart.sh
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
-am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT) \
-	h5clear_gentest$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
+am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 clear_open_chk_SOURCES = clear_open_chk.c
 clear_open_chk_OBJECTS = clear_open_chk.$(OBJEXT)
 clear_open_chk_LDADD = $(LDADD)
@@ -715,7 +715,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \
 	../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
 
 #test script and program
-TEST_PROG = h5repart_gentest talign h5clear_gentest
+TEST_PROG = h5repart_gentest talign
 TEST_SCRIPT = testh5repart.sh testh5mkgrp.sh testh5clear.sh
 check_SCRIPTS = $(TEST_SCRIPT)
 SCRIPT_DEPEND = h5repart$(EXEEXT) h5mkgrp$(EXEEXT) h5clear$(EXEEXT)
@@ -862,6 +862,15 @@ clean-checkPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
 clear_open_chk$(EXEEXT): $(clear_open_chk_OBJECTS) $(clear_open_chk_DEPENDENCIES) $(EXTRA_clear_open_chk_DEPENDENCIES) 
 	@rm -f clear_open_chk$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(clear_open_chk_OBJECTS) $(clear_open_chk_LDADD) $(LIBS)
@@ -1172,13 +1181,6 @@ talign.log: talign$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-h5clear_gentest.log: h5clear_gentest$(EXEEXT)
-	@p='h5clear_gentest$(EXEEXT)'; \
-	b='h5clear_gentest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .sh.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -1271,7 +1273,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libtool mostlyclean-am
+	clean-libtool clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -1345,8 +1347,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 .PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \
 	check-am clean clean-binPROGRAMS clean-checkPROGRAMS \
-	clean-generic clean-libtool cscopelist-am ctags ctags-am \
-	distclean distclean-compile distclean-generic \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-binSCRIPTS install-data install-data-am install-dvi \
diff --git a/tools/misc/clear_open_chk.c b/tools/misc/clear_open_chk.c
index 3a299ec..4256da0 100644
--- a/tools/misc/clear_open_chk.c
+++ b/tools/misc/clear_open_chk.c
@@ -56,13 +56,13 @@ main(int argc, char *argv[])
 
     /* Try opening the file */
     if((fid = h5tools_fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
-	HDfprintf(stdout, "\nclear_open_chk: cannot open the file\n");
+	HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
 	return EXIT_FAILURE;
     }
 
     /* Close the file */
     if(H5Fclose(fid) < 0) {
-	HDfprintf(stdout, "\nclear_open_chk: cannot close the file\n");
+	HDfprintf(stderr, "clear_open_chk: cannot close the file\n");
 	return EXIT_FAILURE;
     }
 
diff --git a/tools/misc/testh5clear.sh.in b/tools/misc/testh5clear.sh.in
index 8c98fed..0e3a48b 100644
--- a/tools/misc/testh5clear.sh.in
+++ b/tools/misc/testh5clear.sh.in
@@ -35,8 +35,6 @@ FAIL=1
 nerrors=0
 verbose=yes
 
-test -d ../testfiles || mkdir ../testfiles
-
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
 #
@@ -55,7 +53,7 @@ TOOLTEST() {
     fname=$1
     #
     # Try to open the test file
-    $OPENCHK_BIN $fname
+    $OPENCHK_BIN $fname 2>/dev/null		# should fail; ignore error message
     if test $? -eq $SUCCEED; then
        echo ".....$OPENCHK: should fail"
        nerrors=`expr $nerrors + 1`
@@ -80,13 +78,13 @@ TOOLTEST() {
 
 # The input file has an incorrect superblock version #
 # Algorithm:
-#	Use "h5clear" to clear status_flags in the test file--should fail not able to open the file
+#	Use "h5clear" to clear status_flags in the test file--should fail to open the file
 # $1 is the filename to H5Fopen() via h5clear
 TOOLFAIL() {
     TESTING $H5CLEAR $1
     fname=$1
     # Run h5clear to clear the status_flags in the test file
-    $RUNSERIAL $H5CLEAR_BIN $fname
+    $RUNSERIAL $H5CLEAR_BIN $fname 2>/dev/null	# should fail: ignore error message
     if test $? -eq $SUCCEED; then
 	echo ".....$H5CLEAR: should fail"
 	nerrors=`expr $nerrors + 1`