diff options
author | dpopat <dpopat@jelly.ad.hdfgroup.org> | 2019-07-19 18:49:49 (GMT) |
---|---|---|
committer | dpopat <dpopat@jelly.ad.hdfgroup.org> | 2019-07-19 18:49:49 (GMT) |
commit | 5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4 (patch) | |
tree | 6ce16f98baef8290ac7ad162189d0878c3df97e7 /tools | |
parent | cc5ee764e9b8d218db1228ffb5108a0092369bbb (diff) | |
download | hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.zip hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.tar.gz hdf5-5f5bb7be8b318a39373ad7bc3c7b32a6937aacf4.tar.bz2 |
Reconfigured autoconf files
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 2 | ||||
-rw-r--r-- | tools/h5copy/Makefile.am | 5 | ||||
-rw-r--r-- | tools/h5copy/Makefile.in | 54 | ||||
-rw-r--r-- | tools/h5diff/Makefile.am | 20 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 27 | ||||
-rw-r--r-- | tools/h5dump/Makefile.am | 18 | ||||
-rw-r--r-- | tools/h5dump/Makefile.in | 20 | ||||
-rw-r--r-- | tools/h5import/Makefile.in | 49 | ||||
-rw-r--r-- | tools/h5jam/Makefile.in | 8 | ||||
-rw-r--r-- | tools/h5ls/Makefile.am | 12 | ||||
-rw-r--r-- | tools/h5ls/Makefile.in | 12 | ||||
-rw-r--r-- | tools/h5repack/Makefile.am | 21 | ||||
-rw-r--r-- | tools/h5repack/Makefile.in | 27 | ||||
-rw-r--r-- | tools/h5stat/Makefile.in | 49 | ||||
-rw-r--r-- | tools/lib/Makefile.in | 2 | ||||
-rw-r--r-- | tools/misc/Makefile.in | 67 | ||||
-rw-r--r-- | tools/perform/Makefile.in | 2 |
17 files changed, 176 insertions, 219 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 138ebd2..cfcb677 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -479,6 +479,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ diff --git a/tools/h5copy/Makefile.am b/tools/h5copy/Makefile.am index 693f3f1..fbaa022 100644 --- a/tools/h5copy/Makefile.am +++ b/tools/h5copy/Makefile.am @@ -25,6 +25,8 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib if BUILD_TESTS_CONDITIONAL TEST_PROG=h5copygentest TEST_SCRIPT=testh5copy.sh +# source file for the test file generator + h5copygentest_SOURCES=h5copygentest.c else TEST_PROG= TEST_SCRIPT= @@ -40,9 +42,6 @@ check_PROGRAMS=$(TEST_PROG) # Add h5copy specific linker flags here h5copy_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) -# source file for the test file generator -h5copygentest_SOURCES=h5copygentest.c - # All programs depend on the hdf5 and h5tools libraries LDADD=$(LIBH5TOOLS) $(LIBHDF5) diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index c2aaa70..d585f34 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -104,8 +104,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = h5copy$(EXEEXT) -check_PROGRAMS = $(am__EXEEXT_1) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +check_PROGRAMS = +TESTS = subdir = tools/h5copy ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -118,7 +118,6 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = testh5copy.sh CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5copygentest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) h5copy_SOURCES = h5copy.c h5copy_OBJECTS = h5copy.$(OBJEXT) @@ -131,10 +130,6 @@ am__v_lt_1 = h5copy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5copy_LDFLAGS) $(LDFLAGS) -o $@ -am_h5copygentest_OBJECTS = h5copygentest.$(OBJEXT) -h5copygentest_OBJECTS = $(am_h5copygentest_OBJECTS) -h5copygentest_LDADD = $(LDADD) -h5copygentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -169,8 +164,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = h5copy.c $(h5copygentest_SOURCES) -DIST_SOURCES = h5copy.c $(h5copygentest_SOURCES) +SOURCES = h5copy.c +DIST_SOURCES = h5copy.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -380,8 +375,11 @@ am__set_TESTS_bases = \ RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log -LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.sh.log=.log) +SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__set_b = \ case '$@' in \ */*) \ @@ -392,11 +390,6 @@ am__set_b = \ *) \ b='$*';; \ esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) -SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/testh5copy.sh.in \ $(top_srcdir)/bin/depcomp $(top_srcdir)/bin/mkinstalldirs \ $(top_srcdir)/bin/test-driver $(top_srcdir)/config/commence.am \ @@ -486,6 +479,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -676,19 +671,12 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 - -# Test programs and scripts -TEST_PROG = h5copygentest -TEST_SCRIPT = testh5copy.sh check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5copy$(EXEEXT) # Add h5copy specific linker flags here h5copy_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) -# source file for the test file generator -h5copygentest_SOURCES = h5copygentest.c - # All programs depend on the hdf5 and h5tools libraries LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -811,10 +799,6 @@ h5copy$(EXEEXT): $(h5copy_OBJECTS) $(h5copy_DEPENDENCIES) $(EXTRA_h5copy_DEPENDE @rm -f h5copy$(EXEEXT) $(AM_V_CCLD)$(h5copy_LINK) $(h5copy_OBJECTS) $(h5copy_LDADD) $(LIBS) -h5copygentest$(EXEEXT): $(h5copygentest_OBJECTS) $(h5copygentest_DEPENDENCIES) $(EXTRA_h5copygentest_DEPENDENCIES) - @rm -f h5copygentest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(h5copygentest_OBJECTS) $(h5copygentest_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -822,7 +806,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5copy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5copygentest.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1033,13 +1016,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -h5copygentest.log: h5copygentest$(EXEEXT) - @p='h5copygentest$(EXEEXT)'; \ - b='h5copygentest'; \ - $(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); \ @@ -1229,6 +1205,14 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp + +# Test programs and scripts +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_PROG=h5copygentest +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=testh5copy.sh +# source file for the test file generator +@BUILD_TESTS_CONDITIONAL_TRUE@ h5copygentest_SOURCES=h5copygentest.c +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_PROG= +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index 44349e9..ce3a370 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -36,27 +36,27 @@ h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # Test programs and scripts if BUILD_TESTS_CONDITIONAL - TEST_PROG=h5diffgentest - TEST_SCRIPT=testh5diff.sh +TEST_PROG=h5diffgentest +TEST_SCRIPT=testh5diff.sh + h5diffgentest_SOURCES=h5diffgentest.c +if HAVE_SHARED_CONDITIONAL +if USE_PLUGINS_CONDITIONAL + TEST_SCRIPT += h5diff_plugin.sh +endif +endif else - TEST_PROG= - TEST_SCRIPT= +TEST_PROG= +TEST_SCRIPT= endif check_PROGRAMS=$(TEST_PROG) check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA) # The parallel test script testph5diff.sh actually depends on testh5diff.sh. SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh -if HAVE_SHARED_CONDITIONAL -if USE_PLUGINS_CONDITIONAL - TEST_SCRIPT += h5diff_plugin.sh -endif -endif # Source files for the program h5diff_SOURCES=h5diff_main.c h5diff_common.c ph5diff_SOURCES=ph5diff_main.c h5diff_common.c -h5diffgentest_SOURCES=h5diffgentest.c # Programs depend on the main HDF5 library and tools library LDADD=$(LIBH5TOOLS) $(LIBHDF5) diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 218b7b8..4b061ef 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -105,9 +105,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = h5diff$(EXEEXT) $(am__EXEEXT_1) +@BUILD_TESTS_CONDITIONAL_TRUE@@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5diff_plugin.sh check_PROGRAMS = $(am__EXEEXT_2) -@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5diff_plugin.sh -TESTS = $(am__EXEEXT_2) $(TEST_SCRIPT) +TESTS = $(am__EXEEXT_2) $(am__EXEEXT_3) subdir = tools/h5diff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -135,7 +135,7 @@ libdynlibdiff_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@am_libdynlibdiff_la_rpath = @BUILD_PARALLEL_CONDITIONAL_TRUE@am__EXEEXT_1 = ph5diff$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" -am__EXEEXT_2 = h5diffgentest$(EXEEXT) +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_2 = h5diffgentest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am_h5diff_OBJECTS = h5diff_main.$(OBJEXT) h5diff_common.$(OBJEXT) h5diff_OBJECTS = $(am_h5diff_OBJECTS) @@ -144,8 +144,8 @@ h5diff_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) h5diff_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5diff_LDFLAGS) $(LDFLAGS) -o $@ -am_h5diffgentest_OBJECTS = h5diffgentest.$(OBJEXT) -h5diffgentest_OBJECTS = $(am_h5diffgentest_OBJECTS) +h5diffgentest_SOURCES = h5diffgentest.c +h5diffgentest_OBJECTS = h5diffgentest.$(OBJEXT) h5diffgentest_LDADD = $(LDADD) h5diffgentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) am_ph5diff_OBJECTS = ph5diff_main.$(OBJEXT) h5diff_common.$(OBJEXT) @@ -187,9 +187,9 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libdynlibdiff_la_SOURCES) $(h5diff_SOURCES) \ - $(h5diffgentest_SOURCES) $(ph5diff_SOURCES) + h5diffgentest.c $(ph5diff_SOURCES) DIST_SOURCES = $(am__libdynlibdiff_la_SOURCES_DIST) $(h5diff_SOURCES) \ - $(h5diffgentest_SOURCES) $(ph5diff_SOURCES) + h5diffgentest.c $(ph5diff_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -398,6 +398,8 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_3 = testh5diff.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) TEST_SUITE_LOG = test-suite.log LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) @@ -506,6 +508,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -705,10 +709,13 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ # Add h5diff specific linker flags here h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_PROG = # Test programs and scripts -TEST_PROG = h5diffgentest -TEST_SCRIPT = testh5diff.sh $(am__append_1) +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_PROG = h5diffgentest +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT = +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = testh5diff.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA) # The parallel test script testph5diff.sh actually depends on testh5diff.sh. SCRIPT_DEPEND = h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh @@ -716,7 +723,6 @@ SCRIPT_DEPEND = h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh # Source files for the program h5diff_SOURCES = h5diff_main.c h5diff_common.c ph5diff_SOURCES = ph5diff_main.c h5diff_common.c -h5diffgentest_SOURCES = h5diffgentest.c # Programs depend on the main HDF5 library and tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -1291,6 +1297,7 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp +@BUILD_TESTS_CONDITIONAL_TRUE@ h5diffgentest_SOURCES=h5diffgentest.c @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@ # Build it as shared library if configure is enabled for shared library. diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am index 1766bc6..2a01897 100644 --- a/tools/h5dump/Makefile.am +++ b/tools/h5dump/Makefile.am @@ -23,21 +23,21 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts if BUILD_TESTS_CONDITIONAL - TEST_PROG=h5dumpgentest - TEST_SCRIPT=testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh +TEST_PROG=h5dumpgentest +TEST_SCRIPT=testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh +if HAVE_SHARED_CONDITIONAL +if USE_PLUGINS_CONDITIONAL + TEST_SCRIPT += h5dump_plugin.sh +endif +endif else - TEST_PROG= - TEST_SCRIPT= +TEST_PROG= +TEST_SCRIPT= endif check_PROGRAMS=$(TEST_PROG) binread check_SCRIPTS=$(TEST_SCRIPT) SCRIPT_DEPEND=h5dump$(EXEEXT) -if HAVE_SHARED_CONDITIONAL -if USE_PLUGINS_CONDITIONAL - TEST_SCRIPT += h5dump_plugin.sh -endif -endif # Our main target, the h5dump tool. bin_PROGRAMS=h5dump diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 6b17ba3..06b7afc 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -104,10 +104,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BUILD_TESTS_CONDITIONAL_TRUE@@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5dump_plugin.sh check_PROGRAMS = $(am__EXEEXT_1) binread$(EXEEXT) -@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5dump_plugin.sh bin_PROGRAMS = h5dump$(EXEEXT) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) subdir = tools/h5dump ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -135,7 +135,7 @@ libdynlibdump_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -o $@ @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@am_libdynlibdump_la_rpath = am__installdirs = "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5dumpgentest$(EXEEXT) +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_1 = h5dumpgentest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) binread_SOURCES = binread.c binread_OBJECTS = binread.$(OBJEXT) @@ -399,6 +399,9 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_2 = testh5dump.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ testh5dumppbits.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ testh5dumpxml.sh $(am__append_1) TEST_SUITE_LOG = test-suite.log LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) @@ -508,6 +511,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -697,11 +702,14 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_PROG = # Test programs and scripts -TEST_PROG = h5dumpgentest -TEST_SCRIPT = testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh \ - $(am__append_1) +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_PROG = h5dumpgentest +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT = +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = testh5dump.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ testh5dumppbits.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ testh5dumpxml.sh $(am__append_1) check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5dump$(EXEEXT) diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 186562e..d83c935 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -103,9 +103,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = $(am__EXEEXT_1) +check_PROGRAMS = bin_PROGRAMS = h5import$(EXEEXT) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +TESTS = subdir = tools/h5import ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -118,7 +118,6 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = h5importtestutil.sh CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5importtest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) h5import_SOURCES = h5import.c h5import_OBJECTS = h5import.$(OBJEXT) @@ -131,10 +130,6 @@ am__v_lt_1 = h5import_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5import_LDFLAGS) $(LDFLAGS) -o $@ -h5importtest_SOURCES = h5importtest.c -h5importtest_OBJECTS = h5importtest.$(OBJEXT) -h5importtest_LDADD = $(LDADD) -h5importtest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -169,8 +164,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = h5import.c h5importtest.c -DIST_SOURCES = h5import.c h5importtest.c +SOURCES = h5import.c +DIST_SOURCES = h5import.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -380,8 +375,11 @@ am__set_TESTS_bases = \ RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log -LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.sh.log=.log) +SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__set_b = \ case '$@' in \ */*) \ @@ -392,11 +390,6 @@ am__set_b = \ *) \ b='$*';; \ esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) -SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in \ $(srcdir)/h5importtestutil.sh.in $(top_srcdir)/bin/depcomp \ $(top_srcdir)/bin/mkinstalldirs $(top_srcdir)/bin/test-driver \ @@ -487,6 +480,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -676,10 +671,6 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files from h5importtest CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.bin - -# Test programs and scripts -TEST_PROG = h5importtest -TEST_SCRIPT = h5importtestutil.sh check_SCRIPT = h5importtestutil.sh SCRIPT_DEPEND = h5import$(EXEEXT) @@ -808,10 +799,6 @@ h5import$(EXEEXT): $(h5import_OBJECTS) $(h5import_DEPENDENCIES) $(EXTRA_h5import @rm -f h5import$(EXEEXT) $(AM_V_CCLD)$(h5import_LINK) $(h5import_OBJECTS) $(h5import_LDADD) $(LIBS) -h5importtest$(EXEEXT): $(h5importtest_OBJECTS) $(h5importtest_DEPENDENCIES) $(EXTRA_h5importtest_DEPENDENCIES) - @rm -f h5importtest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(h5importtest_OBJECTS) $(h5importtest_LDADD) $(LIBS) - mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -819,7 +806,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5import.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5importtest.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1030,13 +1016,6 @@ recheck: all $(check_PROGRAMS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -h5importtest.log: h5importtest$(EXEEXT) - @p='h5importtest$(EXEEXT)'; \ - b='h5importtest'; \ - $(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); \ @@ -1226,6 +1205,12 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp + +# Test programs and scripts +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_PROG=h5importtest +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=h5importtestutil.sh +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_PROG= +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 133b1bd..38495d4 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -105,7 +105,7 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = h5jam$(EXEEXT) h5unjam$(EXEEXT) check_PROGRAMS = tellub$(EXEEXT) h5jamgentest$(EXEEXT) getub$(EXEEXT) -TESTS = $(TEST_SCRIPT) +TESTS = subdir = tools/h5jam ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -498,6 +498,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -689,7 +691,6 @@ TRACE = perl $(top_srcdir)/bin/trace # copied to the testfiles/ directory if update is required. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ testfiles/h5jam-*-sav testfiles/h5unjam-*-sav -TEST_SCRIPT = testh5jam.sh # Add h5jam and h5unjam specific linker flags here h5jam_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) @@ -1247,6 +1248,9 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp + +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=testh5jam.sh +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index ee31ca2..2724b34 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -23,17 +23,17 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts if BUILD_TESTS_CONDITIONAL - TEST_SCRIPT=testh5ls.sh -else - TEST_SCRIPT= -endif -check_SCRIPTS=$(TEST_SCRIPT) -SCRIPT_DEPEND=h5ls$(EXEEXT) +TEST_SCRIPT=testh5ls.sh if HAVE_SHARED_CONDITIONAL if USE_PLUGINS_CONDITIONAL TEST_SCRIPT += h5ls_plugin.sh endif endif +else +TEST_SCRIPT= +endif +check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5ls$(EXEEXT) # This is our main target, the h5ls tool bin_PROGRAMS=h5ls diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 5bcf480..76b4a16 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -104,9 +104,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5ls_plugin.sh +@BUILD_TESTS_CONDITIONAL_TRUE@@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5ls_plugin.sh bin_PROGRAMS = h5ls$(EXEEXT) -TESTS = $(TEST_SCRIPT) +TESTS = $(am__EXEEXT_1) subdir = tools/h5ls ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -385,6 +385,8 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_1 = testh5ls.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) @@ -491,6 +493,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -678,9 +682,11 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog and *.clog2 are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT = # Test programs and scripts -TEST_SCRIPT = testh5ls.sh $(am__append_1) +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = testh5ls.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5ls$(EXEEXT) diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am index 01eb703..86dc51b 100644 --- a/tools/h5repack/Makefile.am +++ b/tools/h5repack/Makefile.am @@ -23,20 +23,21 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib # Test programs and scripts if BUILD_TESTS_CONDITIONAL - TEST_SCRIPT=h5repack.sh - TEST_PROG=h5repacktst -else - TEST_SCRIPT= - TEST_PROG= -endif -noinst_PROGRAMS=testh5repack_detect_szip - -SCRIPT_DEPEND=h5repack$(EXEEXT) +TEST_SCRIPT=h5repack.sh +TEST_PROG=h5repacktst + h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c if HAVE_SHARED_CONDITIONAL if USE_PLUGINS_CONDITIONAL TEST_SCRIPT += h5repack_plugin.sh endif endif +else +TEST_SCRIPT= +TEST_PROG= +endif +noinst_PROGRAMS=testh5repack_detect_szip + +SCRIPT_DEPEND=h5repack$(EXEEXT) check_SCRIPTS=$(TEST_SCRIPT) check_PROGRAMS=$(TEST_PROG) @@ -57,8 +58,6 @@ COMMON_SOURCES=h5repack.c h5repack_copy.c h5repack_filters.c \ h5repack_SOURCES=$(COMMON_SOURCES) h5repack_main.c -h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c - testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c # The h5repack.sh script needs h5repacktst to run first. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 8697a3c..cc8bfc8 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -104,11 +104,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@BUILD_TESTS_CONDITIONAL_TRUE@@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5repack_plugin.sh noinst_PROGRAMS = testh5repack_detect_szip$(EXEEXT) -@HAVE_SHARED_CONDITIONAL_TRUE@@USE_PLUGINS_CONDITIONAL_TRUE@am__append_1 = h5repack_plugin.sh check_PROGRAMS = $(am__EXEEXT_1) bin_PROGRAMS = h5repack$(EXEEXT) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) subdir = tools/h5repack ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -144,7 +144,7 @@ libdynlibvers_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -o $@ @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@am_libdynlibvers_la_rpath = am__installdirs = "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5repacktst$(EXEEXT) +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_1 = h5repacktst$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__objects_1 = h5repack.$(OBJEXT) h5repack_copy.$(OBJEXT) \ h5repack_filters.$(OBJEXT) h5repack_opttable.$(OBJEXT) \ @@ -157,8 +157,8 @@ h5repack_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) h5repack_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5repack_LDFLAGS) $(LDFLAGS) -o $@ -am_h5repacktst_OBJECTS = $(am__objects_1) h5repacktst.$(OBJEXT) -h5repacktst_OBJECTS = $(am_h5repacktst_OBJECTS) +h5repacktst_SOURCES = h5repacktst.c +h5repacktst_OBJECTS = h5repacktst.$(OBJEXT) h5repacktst_LDADD = $(LDADD) h5repacktst_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) am_testh5repack_detect_szip_OBJECTS = \ @@ -203,11 +203,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libdynlibadd_la_SOURCES) $(libdynlibvers_la_SOURCES) \ - $(h5repack_SOURCES) $(h5repacktst_SOURCES) \ + $(h5repack_SOURCES) h5repacktst.c \ $(testh5repack_detect_szip_SOURCES) DIST_SOURCES = $(am__libdynlibadd_la_SOURCES_DIST) \ $(am__libdynlibvers_la_SOURCES_DIST) $(h5repack_SOURCES) \ - $(h5repacktst_SOURCES) $(testh5repack_detect_szip_SOURCES) + h5repacktst.c $(testh5repack_detect_szip_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -416,6 +416,8 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_2 = h5repack.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) TEST_SUITE_LOG = test-suite.log LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) @@ -524,6 +526,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -715,10 +719,13 @@ TRACE = perl $(top_srcdir)/bin/trace # copied to the testfiles/ directory if update is required. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.bin \ testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5 +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT = # Test programs and scripts -TEST_SCRIPT = h5repack.sh $(am__append_1) -TEST_PROG = h5repacktst +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = h5repack.sh \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(am__append_1) +@BUILD_TESTS_CONDITIONAL_FALSE@TEST_PROG = +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_PROG = h5repacktst SCRIPT_DEPEND = h5repack$(EXEEXT) check_SCRIPTS = $(TEST_SCRIPT) @@ -734,7 +741,6 @@ COMMON_SOURCES = h5repack.c h5repack_copy.c h5repack_filters.c \ h5repack_verify.c h5repack_SOURCES = $(COMMON_SOURCES) h5repack_main.c -h5repacktst_SOURCES = $(COMMON_SOURCES) h5repacktst.c testh5repack_detect_szip_SOURCES = testh5repack_detect_szip.c @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@noinst_LTLIBRARIES = libdynlibadd.la libdynlibvers.la @HAVE_SHARED_CONDITIONAL_TRUE@@NOT_UNAME_CYGWIN_TRUE@libdynlibadd_la_SOURCES = dynlib_rpk.c @@ -1331,6 +1337,7 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp +@BUILD_TESTS_CONDITIONAL_TRUE@ h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c # The h5repack.sh script needs h5repacktst to run first. h5repack.sh.chkexe_: h5repacktst.chkexe_ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 08d608f..2286161 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -104,9 +104,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = $(am__EXEEXT_1) +check_PROGRAMS = bin_PROGRAMS = h5stat$(EXEEXT) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +TESTS = subdir = tools/h5stat ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -119,7 +119,6 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = testh5stat.sh CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5stat_gentest$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) h5stat_SOURCES = h5stat.c h5stat_OBJECTS = h5stat.$(OBJEXT) @@ -132,10 +131,6 @@ am__v_lt_1 = h5stat_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5stat_LDFLAGS) $(LDFLAGS) -o $@ -h5stat_gentest_SOURCES = h5stat_gentest.c -h5stat_gentest_OBJECTS = h5stat_gentest.$(OBJEXT) -h5stat_gentest_LDADD = $(LDADD) -h5stat_gentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -198,8 +193,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = h5stat.c h5stat_gentest.c -DIST_SOURCES = h5stat.c h5stat_gentest.c +SOURCES = h5stat.c +DIST_SOURCES = h5stat.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -382,8 +377,11 @@ am__set_TESTS_bases = \ RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log -LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.sh.log=.log) +SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__set_b = \ case '$@' in \ */*) \ @@ -394,11 +392,6 @@ am__set_b = \ *) \ b='$*';; \ esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) -SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/testh5stat.sh.in \ $(top_srcdir)/bin/depcomp $(top_srcdir)/bin/mkinstalldirs \ $(top_srcdir)/bin/test-driver $(top_srcdir)/config/commence.am \ @@ -488,6 +481,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -680,10 +675,6 @@ TRACE = perl $(top_srcdir)/bin/trace # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 - -#test script and program -TEST_PROG = h5stat_gentest -TEST_SCRIPT = testh5stat.sh check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5stat$(EXEEXT) bin_SCRIPTS = @@ -818,10 +809,6 @@ clean-checkPROGRAMS: h5stat$(EXEEXT): $(h5stat_OBJECTS) $(h5stat_DEPENDENCIES) $(EXTRA_h5stat_DEPENDENCIES) @rm -f h5stat$(EXEEXT) $(AM_V_CCLD)$(h5stat_LINK) $(h5stat_OBJECTS) $(h5stat_LDADD) $(LIBS) - -h5stat_gentest$(EXEEXT): $(h5stat_gentest_OBJECTS) $(h5stat_gentest_DEPENDENCIES) $(EXTRA_h5stat_gentest_DEPENDENCIES) - @rm -f h5stat_gentest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(h5stat_gentest_OBJECTS) $(h5stat_gentest_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -865,7 +852,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5stat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5stat_gentest.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1076,13 +1062,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -h5stat_gentest.log: h5stat_gentest$(EXEEXT) - @p='h5stat_gentest$(EXEEXT)'; \ - b='h5stat_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); \ @@ -1275,6 +1254,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS help: @$(top_srcdir)/bin/makehelp + +#test script and program +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_PROG=h5stat_gentest +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=testh5stat.sh +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_PROG= +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 49be556..1ada7ed 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -476,6 +476,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 0df01c9..50e2d11 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -104,9 +104,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = $(am__EXEEXT_1) repart_test$(EXEEXT) +check_PROGRAMS = repart_test$(EXEEXT) bin_PROGRAMS = h5debug$(EXEEXT) h5repart$(EXEEXT) h5mkgrp$(EXEEXT) -TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) +TESTS = subdir = tools/misc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \ @@ -119,7 +119,6 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = h5cc testh5mkgrp.sh testh5repart.sh CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" -am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) h5debug_SOURCES = h5debug.c h5debug_OBJECTS = h5debug.$(OBJEXT) @@ -146,18 +145,10 @@ h5repart_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) h5repart_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(h5repart_LDFLAGS) $(LDFLAGS) -o $@ -h5repart_gentest_SOURCES = h5repart_gentest.c -h5repart_gentest_OBJECTS = h5repart_gentest.$(OBJEXT) -h5repart_gentest_LDADD = $(LDADD) -h5repart_gentest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) repart_test_SOURCES = repart_test.c repart_test_OBJECTS = repart_test.$(OBJEXT) repart_test_LDADD = $(LDADD) repart_test_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) -talign_SOURCES = talign.c -talign_OBJECTS = talign.$(OBJEXT) -talign_LDADD = $(LDADD) -talign_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -220,10 +211,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = h5debug.c h5mkgrp.c h5repart.c h5repart_gentest.c \ - repart_test.c talign.c -DIST_SOURCES = h5debug.c h5mkgrp.c h5repart.c h5repart_gentest.c \ - repart_test.c talign.c +SOURCES = h5debug.c h5mkgrp.c h5repart.c repart_test.c +DIST_SOURCES = h5debug.c h5mkgrp.c h5repart.c repart_test.c am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -406,8 +395,11 @@ am__set_TESTS_bases = \ RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log -LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.sh.log=.log) +SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver +SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__set_b = \ case '$@' in \ */*) \ @@ -418,11 +410,6 @@ am__set_b = \ *) \ b='$*';; \ esac -am__test_logs1 = $(TESTS:=.log) -am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) -TEST_LOGS = $(am__test_logs2:.sh.log=.log) -SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/bin/test-driver -SH_LOG_COMPILE = $(SH_LOG_COMPILER) $(AM_SH_LOG_FLAGS) $(SH_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/h5cc.in \ $(srcdir)/testh5mkgrp.sh.in $(srcdir)/testh5repart.sh.in \ $(top_srcdir)/bin/depcomp $(top_srcdir)/bin/mkinstalldirs \ @@ -513,6 +500,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ @@ -705,10 +694,6 @@ TRACE = perl $(top_srcdir)/bin/trace # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable. CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 \ ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 - -#test script and program -TEST_PROG = h5repart_gentest talign -TEST_SCRIPT = testh5repart.sh testh5mkgrp.sh check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5repart$(EXEEXT) h5mkgrp$(EXEEXT) bin_SCRIPTS = h5redeploy @@ -863,17 +848,9 @@ h5repart$(EXEEXT): $(h5repart_OBJECTS) $(h5repart_DEPENDENCIES) $(EXTRA_h5repart @rm -f h5repart$(EXEEXT) $(AM_V_CCLD)$(h5repart_LINK) $(h5repart_OBJECTS) $(h5repart_LDADD) $(LIBS) -h5repart_gentest$(EXEEXT): $(h5repart_gentest_OBJECTS) $(h5repart_gentest_DEPENDENCIES) $(EXTRA_h5repart_gentest_DEPENDENCIES) - @rm -f h5repart_gentest$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(h5repart_gentest_OBJECTS) $(h5repart_gentest_LDADD) $(LIBS) - repart_test$(EXEEXT): $(repart_test_OBJECTS) $(repart_test_DEPENDENCIES) $(EXTRA_repart_test_DEPENDENCIES) @rm -f repart_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(repart_test_OBJECTS) $(repart_test_LDADD) $(LIBS) - -talign$(EXEEXT): $(talign_OBJECTS) $(talign_DEPENDENCIES) $(EXTRA_talign_DEPENDENCIES) - @rm -f talign$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(talign_OBJECTS) $(talign_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ @@ -919,9 +896,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5debug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5mkgrp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repart.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repart_gentest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repart_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/talign.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1132,20 +1107,6 @@ recheck: all $(check_PROGRAMS) $(check_SCRIPTS) am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -h5repart_gentest.log: h5repart_gentest$(EXEEXT) - @p='h5repart_gentest$(EXEEXT)'; \ - b='h5repart_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) -talign.log: talign$(EXEEXT) - @p='talign$(EXEEXT)'; \ - b='talign'; \ - $(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); \ @@ -1341,6 +1302,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ help: @$(top_srcdir)/bin/makehelp +#test script and program +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_PROG=h5repart_gentest talign +@BUILD_TESTS_CONDITIONAL_TRUE@ TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_PROG= +@BUILD_TESTS_CONDITIONAL_FALSE@ TEST_SCRIPT= + install-exec-local: @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) uninstall-local: diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in index 5af1830..61151fd 100644 --- a/tools/perform/Makefile.in +++ b/tools/perform/Makefile.in @@ -517,6 +517,8 @@ HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_FORTRAN2003 = @HDF_FORTRAN2003@ |