diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2014-01-09 18:21:05 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-01-09 18:21:05 (GMT) |
commit | e1d277b660e0fc572fb768fc954316bc9170a4dd (patch) | |
tree | e267e3435a86901e5343a32ea4d6af7b87d5e032 | |
parent | a196a4f351abed0670c10bc50887bd4e56dd4775 (diff) | |
download | hdf5-e1d277b660e0fc572fb768fc954316bc9170a4dd.zip hdf5-e1d277b660e0fc572fb768fc954316bc9170a4dd.tar.gz hdf5-e1d277b660e0fc572fb768fc954316bc9170a4dd.tar.bz2 |
[svn-r24624] Fix for MANIFEST.
Fix for test failures due to h5clear_gentest.
-rw-r--r-- | MANIFEST | 10 | ||||
-rw-r--r-- | tools/misc/Makefile.am | 3 | ||||
-rw-r--r-- | tools/misc/Makefile.in | 31 | ||||
-rw-r--r-- | tools/misc/clear_open_chk.c | 4 | ||||
-rw-r--r-- | tools/misc/testh5clear.sh.in | 8 |
5 files changed, 35 insertions, 21 deletions
@@ -1090,6 +1090,7 @@ ./test/swmr_remove_writer.c ./test/swmr_sparse_reader.c ./test/swmr_sparse_writer.c +./test/swmr_start_write.c ./test/swmr_writer.c ./test/tarray.c ./test/tarrold.h5 @@ -1112,6 +1113,7 @@ ./test/test_usecases.sh.in ./test/testmeta.c ./test/testswmr.sh +./test/test_swmr.c ./test/tfile.c ./test/tgenprop.c ./test/th5o.c @@ -1358,6 +1360,10 @@ ./tools/misc/Makefile.am ./tools/misc/Makefile.in ./tools/misc/h5cc.in +./tools/misc/h5clear.c +./tools/misc/h5clear_gentest.c +./tools/misc/clear_open_chk.c +./tools/misc/testh5clear.sh.in ./tools/misc/h5debug.c ./tools/misc/h5mkgrp.c ./tools/misc/h5redeploy.in @@ -2341,14 +2347,14 @@ ./hl/test/image24pixel.txt ./hl/test/image24plane.txt ./hl/test/image8.txt -./hl/test/ld_extend.c -./hl/test/ld_monitor.c +./hl/test/ld_mx.c ./hl/test/Makefile.am ./hl/test/Makefile.in ./hl/test/pal_rgb.h ./hl/test/sepia.pal ./hl/test/test_ds_be.h5 ./hl/test/test_ds.c +./hl/test/test_dset_append.c ./hl/test/test_dset_opt.c ./hl/test/test_ds_le.h5 ./hl/test/test_file_image.c diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am index 11e830e..1cbe36c 100644 --- a/tools/misc/Makefile.am +++ b/tools/misc/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/config/commence.am INCLUDES=-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 fad0215..ab86fe6 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -78,6 +78,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 @@ -90,9 +91,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) @@ -512,7 +512,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \ INCLUDES = -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 check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5repart$(EXEEXT) h5mkgrp$(EXEEXT) h5clear$(EXEEXT) @@ -655,6 +655,15 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ 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) @@ -901,7 +910,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) @@ -975,12 +984,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ clean clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ - clean-libtool cscopelist ctags 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 install-dvi-am install-exec \ - install-exec-am install-exec-local install-html \ + clean-libtool clean-noinstPROGRAMS cscopelist ctags 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 install-dvi-am \ + install-exec install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ 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` |