diff options
Diffstat (limited to 'tools/test')
| -rw-r--r-- | tools/test/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/test/h5format_convert/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/test/h5format_convert/h5fc_gentest.c | 1 | ||||
| -rw-r--r-- | tools/test/h5repack/Makefile.am | 10 |
4 files changed, 7 insertions, 10 deletions
diff --git a/tools/test/Makefile.am b/tools/test/Makefile.am index 62193ba..db09003 100644 --- a/tools/test/Makefile.am +++ b/tools/test/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/config/commence.am CONFIG=ordered # All subdirectories -SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \ - perform +SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy \ + h5format_convert h5stat perform include $(top_srcdir)/config/conclude.am diff --git a/tools/test/h5format_convert/Makefile.am b/tools/test/h5format_convert/Makefile.am index 5779d4d..f67b2ce 100644 --- a/tools/test/h5format_convert/Makefile.am +++ b/tools/test/h5format_convert/Makefile.am @@ -31,6 +31,8 @@ check_PROGRAMS=$(TEST_PROG) h5fc_chk_idx check_SCRIPTS=$(TEST_SCRIPT) SCRIPT_DEPEND=../../src/h5format_convert/h5format_convert$(EXEEXT) +CLEANFILES= + # Tell automake to clean h5redeploy script CHECK_CLEANFILES+=*.h5 diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c index 520e5bf..fea7eed 100644 --- a/tools/test/h5format_convert/h5fc_gentest.c +++ b/tools/test/h5format_convert/h5fc_gentest.c @@ -296,7 +296,6 @@ error: H5Dclose(did2); H5Gclose(gid); H5Fclose(fcpl); - H5Fclose(fapl); H5Fclose(fid); } H5E_END_TRY; diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am index 6c045c4..5c284b3 100644 --- a/tools/test/h5repack/Makefile.am +++ b/tools/test/h5repack/Makefile.am @@ -37,16 +37,12 @@ endif check_SCRIPTS=$(TEST_SCRIPT) -# Depend on the hdf5 library, the tools library, the test library -LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) +# Depend on the h5repack library, the hdf5 library, the tools library, the test library +LDADD=../../src/h5repack/libh5repack.la $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c -# Source files -COMMON_SOURCES=../../src/h5repack/h5repack.c ../../src/h5repack/h5repack_copy.c ../../src/h5repack/h5repack_filters.c \ - ../../src/h5repack/h5repack_opttable.c ../../src/h5repack/h5repack_parse.c ../../src/h5repack/h5repack_refs.c \ - ../../src/h5repack/h5repack_verify.c -h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c +h5repacktst_SOURCES=h5repacktst.c if HAVE_SHARED_CONDITIONAL |