summaryrefslogtreecommitdiffstats
path: root/tools/test/h5format_convert
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-01-11 20:24:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-01-11 20:24:09 (GMT)
commitee485247b7028bea18251ee0b22c918618652bec (patch)
treedd126712b61bfa9e56bdc020be1ab01f56edc60c /tools/test/h5format_convert
parent7fb991e8edd9cef200f4769bbd22e7eff2b9e27f (diff)
parent8b4c9f848d63351c85cab3a5b2034f8e7e1a29db (diff)
downloadhdf5-ee485247b7028bea18251ee0b22c918618652bec.zip
hdf5-ee485247b7028bea18251ee0b22c918618652bec.tar.gz
hdf5-ee485247b7028bea18251ee0b22c918618652bec.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '8b4c9f848d63351c85cab3a5b2034f8e7e1a29db': h5format_convert was not built (missing from subdirs in tools/src and tools/test Makefile.ams) but created dependencies that were not cleaned up by make clean and make distclean. Create h5repack convenience library for common code used by h5repack tool and h5repacktst. Fixes broken distclean. Added an --enable-developer-warnings option to configure so users can ignore -Wsuggest-attribute warnings and other noise that doesn't indicate poor code quality.
Diffstat (limited to 'tools/test/h5format_convert')
-rw-r--r--tools/test/h5format_convert/Makefile.am2
-rw-r--r--tools/test/h5format_convert/h5fc_gentest.c1
2 files changed, 2 insertions, 1 deletions
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;