diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-09-10 14:24:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-09-10 14:24:34 (GMT) |
| commit | 175e82e4843dbf2d6bec7f7121798338f4564379 (patch) | |
| tree | b3d93c7c46e8e64984ca6b39db970bf4b5323b40 /tools | |
| parent | b0d34310f5ff752c5ab1ef3a0c88229aea32c31f (diff) | |
| download | hdf5-175e82e4843dbf2d6bec7f7121798338f4564379.zip hdf5-175e82e4843dbf2d6bec7f7121798338f4564379.tar.gz hdf5-175e82e4843dbf2d6bec7f7121798338f4564379.tar.bz2 | |
[svn-r24120] HDFFV-8345: plugin test properly checks static-exec result to include test.
Tested: jam
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5repack/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/h5repack/Makefile.in | 4 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_plugin.sh.in | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am index c52112b..663e501 100644 --- a/tools/h5repack/Makefile.am +++ b/tools/h5repack/Makefile.am @@ -30,7 +30,9 @@ noinst_PROGRAMS=testh5repack_detect_szip SCRIPT_DEPEND=h5repack$(EXEEXT) if HAVE_SHARED_CONDITIONAL - TEST_SCRIPT += h5repack_plugin.sh +if USE_PLUGINS_CONDITIONAL + TEST_SCRIPT += h5repack_plugin.sh +endif endif check_SCRIPTS=$(TEST_SCRIPT) diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 1b87fd6..aa51cd1 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -74,7 +74,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/config/commence.am \ $(top_srcdir)/config/conclude.am noinst_PROGRAMS = testh5repack_detect_szip$(EXEEXT) -@HAVE_SHARED_CONDITIONAL_TRUE@am__append_1 = h5repack_plugin.sh +@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) @@ -507,7 +507,7 @@ h5repacktst_SOURCES = $(COMMON_SOURCES) h5repacktst.c testh5repack_detect_szip_SOURCES = testh5repack_detect_szip.c @HAVE_SHARED_CONDITIONAL_TRUE@lib_LTLIBRARIES = libdynlibadd.la @HAVE_SHARED_CONDITIONAL_TRUE@libdynlibadd_la_SOURCES = $(top_srcdir)/test/dynlib1.c -DISTCLEANFILES = h5repack.sh +DISTCLEANFILES = h5repack.sh h5repack_plugin.sh # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., diff --git a/tools/h5repack/h5repack_plugin.sh.in b/tools/h5repack/h5repack_plugin.sh.in index e8ba83e..a45d1fe 100644 --- a/tools/h5repack/h5repack_plugin.sh.in +++ b/tools/h5repack/h5repack_plugin.sh.in @@ -222,7 +222,7 @@ COPY_TESTFILES_TO_TESTDIR # Run the test arg="h5repack_layout.h5 -v -f UD=257,1,9" -#TOOLTEST_DUMP plugin_test $arg +TOOLTEST_DUMP plugin_test $arg # print results if test $nerrors -ne 0 ; then |