summaryrefslogtreecommitdiffstats
path: root/tools/h5stat
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-04-14 19:01:01 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-04-14 19:01:01 (GMT)
commita02e4e608269dbd76f66031462e837207dc67237 (patch)
tree26b5760732b6c3b42cde3392d1e6b846db473855 /tools/h5stat
parent3ac6af666cd304b958631013195413b936a9aac4 (diff)
downloadhdf5-a02e4e608269dbd76f66031462e837207dc67237.zip
hdf5-a02e4e608269dbd76f66031462e837207dc67237.tar.gz
hdf5-a02e4e608269dbd76f66031462e837207dc67237.tar.bz2
[svn-r29694] HDFFV-9756,9766,9719:
9756-fix h5diff VDS 9766-fix h5repack VDS 9719 - reconcile tools differences
Diffstat (limited to 'tools/h5stat')
-rw-r--r--tools/h5stat/CMakeTests.cmake4
-rw-r--r--tools/h5stat/h5stat_gentest.c7
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake
index 4175eb2..5d3c82e 100644
--- a/tools/h5stat/CMakeTests.cmake
+++ b/tools/h5stat/CMakeTests.cmake
@@ -25,6 +25,7 @@
h5stat_newgrat.ddl
h5stat_newgrat-UG.ddl
h5stat_newgrat-UA.ddl
+ h5stat_idx.ddl
h5stat_err1_links.ddl
h5stat_links1.ddl
h5stat_links2.ddl
@@ -45,6 +46,7 @@
h5stat_filters.h5
h5stat_tsohm.h5
h5stat_newgrat.h5
+ h5stat_idx.h5
h5stat_threshold.h5
)
@@ -213,6 +215,8 @@
ADD_H5_TEST (h5stat_newgrat 0 h5stat_newgrat.h5)
ADD_H5_TEST (h5stat_newgrat-UG 0 -G h5stat_newgrat.h5)
ADD_H5_TEST (h5stat_newgrat-UA 0 -A h5stat_newgrat.h5)
+# h5stat_idx.h5 is generated by h5stat_gentest.c
+ ADD_H5_TEST (h5stat_idx 0 h5stat_idx.h5)
#
# Tests for -l (--links) option on h5stat_threshold.h5:
# -l 0 (incorrect threshold value)
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 02bd136..b1ab168 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -121,10 +121,10 @@ gen_newgrat_file(const char *fname)
goto error;
if(H5Dclose(did) < 0)
goto error;
- if(H5Tclose(tid) < 0)
- goto error;
if(H5Sclose(sid) < 0)
goto error;
+ if(H5Tclose(tid) < 0)
+ goto error;
if(H5Fclose(fid) < 0)
goto error;
@@ -133,15 +133,14 @@ error:
H5Pclose(fapl);
H5Pclose(fcpl);
H5Aclose(attr_id);
+ H5Dclose(did);
H5Tclose(tid);
H5Sclose(sid);
H5Gclose(gid);
- H5Dclose(did);
H5Fclose(fid);
} H5E_END_TRY;
} /* gen_newgrat_file() */
-
/*
* Generate an HDF5 file with groups, datasets, attributes for testing the options:
* -l N (--links=N): Set the threshold for # of links when printing information for small groups.