Split tools into src and test - remove folders

43 files changed, 0 insertions, 3892 deletions

diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
deleted file mode 100644
index 02721d4..0000000
--- a/tools/h5stat/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required (VERSION 3.1.0)
-PROJECT (HDF5_TOOLS_H5STAT)
-
-#-----------------------------------------------------------------------------
-# Setup include Directories
-#-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
-
-# --------------------------------------------------------------------
-# Add the h5stat executables
-# --------------------------------------------------------------------
-add_executable (h5stat ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/h5stat.c)
-TARGET_NAMING (h5stat STATIC)
-TARGET_C_PROPERTIES (h5stat STATIC " " " ")
-target_link_libraries (h5stat  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
-set_target_properties (h5stat PROPERTIES FOLDER tools)
-set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5stat")
-
-set (H5_DEP_EXECUTABLES h5stat)
-
-if (BUILD_TESTING)
-  # --------------------------------------------------------------------
-  # Add the h5stat test executables
-  # --------------------------------------------------------------------
-  if (HDF5_BUILD_GENERATORS)
-    add_executable (h5stat_gentest ${HDF5_TOOLS_H5STAT_SOURCE_DIR}/h5stat_gentest.c)
-    TARGET_NAMING (h5stat_gentest STATIC)
-    TARGET_C_PROPERTIES (h5stat_gentest STATIC " " " ")
-    target_link_libraries (h5stat_gentest ${HDF5_LIB_TARGET})
-    set_target_properties (h5stat_gentest PROPERTIES FOLDER generator/tools)
-
-    #add_test (NAME h5stat_gentest COMMAND $<TARGET_FILE:h5stat_gentest>)
-  endif (HDF5_BUILD_GENERATORS)
-
-  include (CMakeTests.cmake)
-endif (BUILD_TESTING)
-
-##############################################################################
-##############################################################################
-###           I N S T A L L A T I O N                                      ###
-##############################################################################
-##############################################################################
-
-#-----------------------------------------------------------------------------
-# Rules for Installation of tools using make Install target
-#-----------------------------------------------------------------------------
-
-#INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-
-install (
-    TARGETS
-        h5stat
-    EXPORT
-        ${HDF5_EXPORTED_TARGETS}
-    RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
-)
diff --git a/tools/h5stat/CMakeTests.cmake b/tools/h5stat/CMakeTests.cmake
deleted file mode 100644
index fea358a..0000000
--- a/tools/h5stat/CMakeTests.cmake
+++ /dev/null
@@ -1,237 +0,0 @@
-
-##############################################################################
-##############################################################################
-###           T E S T I N G                                                ###
-##############################################################################
-##############################################################################
-
-  # --------------------------------------------------------------------
-  # Copy all the HDF5 files from the test directory into the source directory
-  # --------------------------------------------------------------------
-  set (HDF5_REFERENCE_FILES
-      h5stat_help1.ddl
-      h5stat_help2.ddl
-      h5stat_notexist.ddl
-      h5stat_nofile.ddl
-      h5stat_filters.ddl
-      h5stat_filters-file.ddl
-      h5stat_filters-F.ddl
-      h5stat_filters-d.ddl
-      h5stat_filters-g.ddl
-      h5stat_filters-dT.ddl
-      h5stat_filters-UD.ddl
-      h5stat_filters-UT.ddl
-      h5stat_tsohm.ddl
-      h5stat_newgrat.ddl
-      h5stat_newgrat-UG.ddl
-      h5stat_newgrat-UA.ddl
-      h5stat_err1_links.ddl
-      h5stat_links1.ddl
-      h5stat_links2.ddl
-      h5stat_links3.ddl
-      h5stat_links4.ddl
-      h5stat_links5.ddl
-      h5stat_err1_dims.ddl
-      h5stat_dims1.ddl
-      h5stat_dims2.ddl
-      h5stat_err1_numattrs.ddl
-      h5stat_err2_numattrs.ddl
-      h5stat_numattrs1.ddl
-      h5stat_numattrs2.ddl
-      h5stat_numattrs3.ddl
-      h5stat_numattrs4.ddl
-  )
-  set (HDF5_REFERENCE_TEST_FILES
-      h5stat_filters.h5
-      h5stat_tsohm.h5
-      h5stat_newgrat.h5
-      h5stat_threshold.h5
-  )
-
-  foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/${ddl_file}" "h5stat_files")
-  endforeach (ddl_file ${HDF5_REFERENCE_FILES})
-
-  foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
-  endforeach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-  add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list})
-
-##############################################################################
-##############################################################################
-###           T H E   T E S T S  M A C R O S                               ###
-##############################################################################
-##############################################################################
-
-  MACRO (ADD_H5_TEST resultfile resultcode)
-    # If using memchecker add tests without using scripts
-    if (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (NAME H5STAT-${resultfile} COMMAND $<TARGET_FILE:h5stat> ${ARGN})
-      if (NOT ${resultcode} STREQUAL "0")
-        set_tests_properties (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true")
-      endif (NOT ${resultcode} STREQUAL "0")
-      if (NOT "${last_test}" STREQUAL "")
-        set_tests_properties (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test})
-      endif (NOT "${last_test}" STREQUAL "")
-    else (HDF5_ENABLE_USING_MEMCHECKER)
-      add_test (
-          NAME H5STAT-${resultfile}
-          COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_PROGRAM=$<TARGET_FILE:h5stat>"
-              -D "TEST_ARGS=${ARGN}"
-              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
-              -D "TEST_OUTPUT=${resultfile}.out"
-              -D "TEST_EXPECT=${resultcode}"
-              -D "TEST_REFERENCE=${resultfile}.ddl"
-              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
-      )
-    endif (HDF5_ENABLE_USING_MEMCHECKER)
-  ENDMACRO (ADD_H5_TEST file)
-
-##############################################################################
-##############################################################################
-###           T H E   T E S T S                                            ###
-##############################################################################
-##############################################################################
-
-  if (HDF5_ENABLE_USING_MEMCHECKER)
-    # Remove any output file left over from previous test run
-    add_test (
-      NAME H5STAT-clearall-objects
-      COMMAND    ${CMAKE_COMMAND}
-          -E remove
-          h5stat_help1.out
-          h5stat_help1.out.err
-          h5stat_help2.out
-          h5stat_help2.out.err
-          h5stat_notexist.out
-          h5stat_notexist.out.err
-          h5stat_nofile.out
-          h5stat_nofile.out.err
-          h5stat_filters.out
-          h5stat_filters.out.err
-          h5stat_filters-file.out
-          h5stat_filters-file.out.err
-          h5stat_filters-F.out
-          h5stat_filters-F.out.err
-          h5stat_filters-d.out
-          h5stat_filters-d.out.err
-          h5stat_filters-g.out
-          h5stat_filters-g.out.err
-          h5stat_filters-dT.out
-          h5stat_filters-dT.out.err
-          h5stat_filters-UD.out
-          h5stat_filters-UD.out.err
-          h5stat_filters-UT.out
-          h5stat_filters-UT.out.err
-          h5stat_tsohm.out
-          h5stat_tsohm.out.err
-          h5stat_newgrat.out
-          h5stat_newgrat.out.err
-          h5stat_newgrat-UG.out
-          h5stat_newgrat-UG.out.err
-          h5stat_newgrat-UA.out
-          h5stat_newgrat-UA.out.err
-          h5stat_err1_links.out
-          h5stat_err1_links.out.err
-          h5stat_links1.out
-          h5stat_links1.out.err
-          h5stat_links2.out
-          h5stat_links2.out.err
-          h5stat_links3.out
-          h5stat_links3.out.err
-          h5stat_links4.out
-          h5stat_links4.out.err
-          h5stat_links5.out
-          h5stat_links5.out.err
-          h5stat_err1_dims.out
-          h5stat_err1_dims.out.err
-          h5stat_dims1.out
-          h5stat_dims1.out.err
-          h5stat_dims2.out
-          h5stat_dims2.out.err
-          h5stat_err1_numattrs.out
-          h5stat_err1_numattrs.out.err
-          h5stat_err2_numattrs.out
-          h5stat_err2_numattrs.out.err
-          h5stat_numattrs1.out
-          h5stat_numattrs1.out.err
-          h5stat_numattrs2.out
-          h5stat_numattrs2.out.err
-          h5stat_numattrs3.out
-          h5stat_numattrs3.out.err
-          h5stat_numattrs4.out
-          h5stat_numattrs4.out.err
-    )
-    if (NOT "${last_test}" STREQUAL "")
-      set_tests_properties (H5STAT-clearall-objects PROPERTIES DEPENDS ${last_test})
-    endif (NOT "${last_test}" STREQUAL "")
-    set (last_test "H5STAT-clearall-objects")
-  endif (HDF5_ENABLE_USING_MEMCHECKER)
-
-# Test for help flag
-  ADD_H5_TEST (h5stat_help1 0 -h)
-  ADD_H5_TEST (h5stat_help2 0 --help)
-
-# Test when h5stat a file that does not exist
-  ADD_H5_TEST (h5stat_notexist 1 notexist.h5)
-  ADD_H5_TEST (h5stat_nofile 1 '')
-
-# Test file with groups, compressed datasets, user-applied fileters, etc.
-# h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
-  ADD_H5_TEST (h5stat_filters 0 h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-file 0 -f h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-F 0 -F h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-d 0 -d h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-g 0 -g h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-dT 0 -dT h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-UD 0 -D h5stat_filters.h5)
-  ADD_H5_TEST (h5stat_filters-UT 0 -T h5stat_filters.h5)
-# h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c
-# as of release 1.8.7-snap0 (on a 64-bit machine)
-  ADD_H5_TEST (h5stat_tsohm 0 h5stat_tsohm.h5)
-# h5stat_newgrat.h5 is generated by h5stat_gentest.c
-  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)
-#
-# Tests for -l (--links) option on h5stat_threshold.h5:
-#   -l 0 (incorrect threshold value)
-#   -g -l 8
-#   --links=8
-#   --links=20 -g
-  ADD_H5_TEST (h5stat_err1_links 1 -l 0 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_links1 0 -g -l 8 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_links2 0 --links=8 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_links3 0 --links=20 -g h5stat_threshold.h5)
-#
-# Tests for -l (--links) option on h5stat_newgrat.h5:
-#   -g
-#   -g -l 40000
-  ADD_H5_TEST (h5stat_links4 0 -g h5stat_newgrat.h5)
-  ADD_H5_TEST (h5stat_links5 0 -g -l 40000 h5stat_newgrat.h5)
-#
-# Tests for -m (--dims) option on h5stat_threshold.h5
-#   -d --dims=-1 (incorrect threshold value)
-#   -gd -m 5
-#   -d --di=15
-  ADD_H5_TEST (h5stat_err1_dims 1 -d --dims=-1 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_dims1 0 -gd -m 5 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_dims2 0 -d --di=15 h5stat_threshold.h5)
-#
-# Tests for -a option on h5stat_threshold.h5
-#   -a -2 (incorrect threshold value)
-#   --numattrs (without threshold value)
-#   -AS -a 10
-#   -a 1
-#   -A --numattrs=25
-  ADD_H5_TEST (h5stat_err1_numattrs 1 -a -2 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_err2_numattrs 1 --numattrs h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_numattrs1 0 -AS -a 10 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_numattrs2 0 -a 1 h5stat_threshold.h5)
-  ADD_H5_TEST (h5stat_numattrs3 0 -A --numattrs=25 h5stat_threshold.h5)
-#
-# Tests for -a option on h5stat_newgrat.h5
-#   -A -a 100
-  ADD_H5_TEST (h5stat_numattrs4 0 -A -a 100 h5stat_newgrat.h5)
-#
diff --git a/tools/h5stat/Makefile.am b/tools/h5stat/Makefile.am
deleted file mode 100644
index 2a5921f..0000000
--- a/tools/h5stat/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-##
-## Makefile.am
-## Run automake to generate a Makefile.in from this file.
-#
-# HDF5 Library Makefile(.in)
-#
-
-include $(top_srcdir)/config/commence.am
-
-# Include src directory
-AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-
-#test script and program
-TEST_PROG=h5stat_gentest
-TEST_SCRIPT=testh5stat.sh
-
-check_PROGRAMS=$(TEST_PROG)
-check_SCRIPTS=$(TEST_SCRIPT)
-SCRIPT_DEPEND=h5stat$(EXEEXT)
-
-# These are our main targets, the tools
-bin_PROGRAMS=h5stat
-bin_SCRIPTS=
-
-# Add h5stat specific linker flags here
-h5stat_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS)
-
-# Tell automake to clean h5redeploy script
-CLEANFILES=
-
-# Temporary files.  *.h5 are generated by h5repart_gentest.  They should
-# copied to the testfiles/ directory if update is required. fst_family*.h5
-# and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable.
-CHECK_CLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
-
-# These were generated by configure.  Remove them only when distclean.
-DISTCLEANFILES=testh5stat.sh
-
-# All programs rely on hdf5 library and h5tools library
-LDADD=$(LIBH5TOOLS) $(LIBHDF5)
-
-include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
deleted file mode 100644
index a331014..0000000
--- a/tools/h5stat/h5stat.c
+++ /dev/null
@@ -1,1815 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#include <stdlib.h>
-#include <string.h>
-#include "H5private.h"    /* Generic Functions      */
-#include "h5tools.h"
-#include "h5tools_utils.h"
-#include "h5tools_ref.h"
-#include "h5trav.h"
-#include "hdf5.h"
-
-/* Name of tool */
-#define PROGRAMNAME "h5stat"
-
-/* Parameters to control statistics gathered */
-
-/* Default threshold for small groups/datasets/attributes */
-#define DEF_SIZE_SMALL_GROUPS       	10
-#define DEF_SIZE_SMALL_DSETS        	10
-#define DEF_SIZE_SMALL_ATTRS  		10
-
-#define SIZE_SMALL_SECTS        	10
-
-#define  H5_NFILTERS_IMPL        8     /* Number of currently implemented filters + one to
-                                          accommodate for user-define filters + one
-                                          to accomodate datasets whithout any filters */
-
-/* File space management strategies: see H5Fpublic.h for declarations */
-const char *FS_STRATEGY_NAME[] = {
-    "unknown",
-    "H5F_FILE_SPACE_ALL_PERSIST",
-    "H5F_FILE_SPACE_ALL",
-    "H5F_FILE_SPACE_AGGR_VFD",
-    "H5F_FILE_SPACE_VFD",
-    NULL
-};
-
-/* Datatype statistics for datasets */
-typedef struct dtype_info_t {
-    hid_t tid;                          /* ID of datatype */
-    unsigned long count;                /* Number of types found */
-    unsigned long named;                /* Number of types that are named */
-} dtype_info_t;
-
-typedef struct ohdr_info_t {
-    hsize_t total_size;                 /* Total size of object headers */
-    hsize_t free_size;                  /* Total free space in object headers */
-} ohdr_info_t;
-
-/* Info to pass to the iteration functions */
-typedef struct iter_t {
-    hid_t fid;                          /* File ID */
-    hsize_t filesize;      /* Size of the file */
-    unsigned long uniq_groups;          /* Number of unique groups */
-    unsigned long uniq_dsets;           /* Number of unique datasets */
-    unsigned long uniq_dtypes;          /* Number of unique named datatypes */
-    unsigned long uniq_links;           /* Number of unique links */
-    unsigned long uniq_others;          /* Number of other unique objects */
-
-    unsigned long max_links;            /* Maximum # of links to an object */
-    hsize_t max_fanout;                 /* Maximum fanout from a group */
-    unsigned long *num_small_groups;    /* Size of small groups tracked */
-    unsigned group_nbins;               /* Number of bins for group counts */
-    unsigned long *group_bins;          /* Pointer to array of bins for group counts */
-    ohdr_info_t group_ohdr_info;        /* Object header information for groups */
-
-    hsize_t  max_attrs;                 /* Maximum attributes from a group */
-    unsigned long *num_small_attrs;    	/* Size of small attributes tracked */
-    unsigned attr_nbins;                /* Number of bins for attribute counts */
-    unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
-
-    unsigned max_dset_rank;             /* Maximum rank of dataset */
-    unsigned long dset_rank_count[H5S_MAX_RANK];   /* Number of datasets of each rank */
-    hsize_t max_dset_dims;              /* Maximum dimension size of dataset */
-    unsigned long *small_dset_dims;    /* Size of dimensions of small datasets tracked */
-    unsigned long dset_layouts[H5D_NLAYOUTS];           /* Type of storage for each dataset */
-    unsigned long dset_comptype[H5_NFILTERS_IMPL]; 	/* Number of currently implemented filters */
-    unsigned long dset_ntypes;          /* Number of diff. dataset datatypes found */
-    dtype_info_t *dset_type_info;       /* Pointer to dataset datatype information found */
-    unsigned dset_dim_nbins;            /* Number of bins for dataset dimensions */
-    unsigned long *dset_dim_bins;       /* Pointer to array of bins for dataset dimensions */
-    ohdr_info_t dset_ohdr_info;         /* Object header information for datasets */
-    hsize_t dset_storage_size;          /* Size of raw data for datasets */
-    hsize_t dset_external_storage_size; /* Size of raw data for datasets with external storage */
-    ohdr_info_t dtype_ohdr_info;        /* Object header information for datatypes */
-    hsize_t groups_btree_storage_size;  /* btree size for group */
-    hsize_t groups_heap_storage_size;   /* heap size for group */
-    hsize_t attrs_btree_storage_size;   /* btree size for attributes (1.8) */
-    hsize_t attrs_heap_storage_size;    /* fractal heap size for attributes (1.8) */
-    hsize_t SM_hdr_storage_size;        /* header size for SOHM table (1.8) */
-    hsize_t SM_index_storage_size;      /* index (btree & list) size for SOHM table (1.8) */
-    hsize_t SM_heap_storage_size;       /* fractal heap size for SOHM table (1.8) */
-    hsize_t super_size;                 /* superblock size */
-    hsize_t super_ext_size;             /* superblock extension size */
-    hsize_t ublk_size;                  /* user block size (if exists) */
-    H5F_file_space_type_t fs_strategy;  /* File space management strategy */
-    hsize_t fs_threshold;               /* Free-space section threshold */
-    hsize_t free_space;                 /* amount of freespace in the file */
-    hsize_t free_hdr;                   /* size of free space manager metadata in the file */
-    unsigned long num_small_sects[SIZE_SMALL_SECTS];   /* Size of small free-space sections */
-    unsigned sect_nbins;                /* Number of bins for free-space section sizes */
-    unsigned long *sect_bins;           /* Pointer to array of bins for free-space section sizes */
-    hsize_t datasets_index_storage_size;/* meta size for chunked dataset's indexing type */
-    hsize_t datasets_heap_storage_size; /* heap size for dataset with external storage */
-    unsigned long nexternal;            /* Number of external files for a dataset */
-    int           local;                /* Flag to indicate iteration over the object*/
-} iter_t;
-
-
-static int        display_all = TRUE;
-
-/* Enable the printing of selected statistics */
-static int        display_file = FALSE;     /* display file information */
-static int        display_group = FALSE;    /* display groups information */
-static int        display_dset = FALSE;     /* display datasets information */
-static int        display_dset_dtype_meta = FALSE;  /* display datasets' datatype information */
-static int        display_attr = FALSE;     /* display attributes information */
-static int        display_free_sections = FALSE;    /* display free space information */
-static int        display_summary = FALSE;  /* display summary of file space information */
-
-static int        display_file_metadata = FALSE;    /* display file space info for file's metadata */
-static int        display_group_metadata = FALSE;   /* display file space info for groups' metadata */
-static int        display_dset_metadata = FALSE;    /* display file space info for datasets' metadata */
-
-static int        display_object = FALSE;  /* not implemented yet */
-
-/* Initialize threshold for small groups/datasets/attributes */
-static int	  sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
-static int	  sdsets_threshold = DEF_SIZE_SMALL_DSETS;
-static int	  sattrs_threshold = DEF_SIZE_SMALL_ATTRS;
-
-/* a structure for handling the order command-line parameters come in */
-struct handler_t {
-    size_t obj_count;
-    char **obj;
-};
-
-static const char *s_opts ="Aa:Ddm:FfhGgl:sSTO:V";
-/* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
-static struct long_options l_opts[] = {
-    {"help", no_arg, 'h'},
-    {"hel", no_arg, 'h'},
-    {"he", no_arg, 'h'},
-    {"filemetadata", no_arg, 'F'},
-    {"filemetadat", no_arg, 'F'},
-    {"filemetada", no_arg, 'F'},
-    {"filemetad", no_arg, 'F'},
-    {"filemeta", no_arg, 'F'},
-    {"filemet", no_arg, 'F'},
-    {"fileme", no_arg, 'F'},
-    {"filem", no_arg, 'F'},
-    {"file", no_arg, 'f'},
-    {"fil", no_arg, 'f'},
-    {"fi", no_arg, 'f'},
-    {"groupmetadata", no_arg, 'G'},
-    {"groupmetadat", no_arg, 'G'},
-    {"groupmetada", no_arg, 'G'},
-    {"groupmetad", no_arg, 'G'},
-    {"groupmeta", no_arg, 'G'},
-    {"groupmet", no_arg, 'G'},
-    {"groupme", no_arg, 'G'},
-    {"groupm", no_arg, 'G'},
-    {"group", no_arg, 'g'},
-    {"grou", no_arg, 'g'},
-    {"gro", no_arg, 'g'},
-    {"gr", no_arg, 'g'},
-    { "links", require_arg, 'l' },
-    { "link", require_arg, 'l' },
-    { "lin", require_arg, 'l' },
-    { "li", require_arg, 'l' },
-    {"dsetmetadata", no_arg, 'D'},
-    {"dsetmetadat", no_arg, 'D'},
-    {"dsetmetada", no_arg, 'D'},
-    {"dsetmetad", no_arg, 'D'},
-    {"dsetmeta", no_arg, 'D'},
-    {"dsetmet", no_arg, 'D'},
-    {"dsetme", no_arg, 'D'},
-    {"dsetm", no_arg, 'D'},
-    {"dset", no_arg, 'd'},
-    {"dse", no_arg, 'd'},
-    {"ds", no_arg, 'd'},
-    {"dims", require_arg, 'm'},
-    {"dim", require_arg, 'm'},
-    {"di", require_arg, 'm'},
-    {"dtypemetadata", no_arg, 'T'},
-    {"dtypemetadat", no_arg, 'T'},
-    {"dtypemetada", no_arg, 'T'},
-    {"dtypemetad", no_arg, 'T'},
-    {"dtypemeta", no_arg, 'T'},
-    {"dtypemet", no_arg, 'T'},
-    {"dtypeme", no_arg, 'T'},
-    {"dtypem", no_arg, 'T'},
-    {"dtype", no_arg, 'T'},
-    {"dtyp", no_arg, 'T'},
-    {"dty", no_arg, 'T'},
-    {"dt", no_arg, 'T'},
-    { "object", require_arg, 'O' },
-    { "objec", require_arg, 'O' },
-    { "obje", require_arg, 'O' },
-    { "obj", require_arg, 'O' },
-    { "ob", require_arg, 'O' },
-    { "version", no_arg, 'V' },
-    { "versio", no_arg, 'V' },
-    { "versi", no_arg, 'V' },
-    { "vers", no_arg, 'V' },
-    { "ver", no_arg, 'V' },
-    { "ve", no_arg, 'V' },
-    { "attribute", no_arg, 'A' },
-    { "attribut", no_arg, 'A' },
-    { "attribu", no_arg, 'A' },
-    { "attrib", no_arg, 'A' },
-    { "attri", no_arg, 'A' },
-    { "attr", no_arg, 'A' },
-    { "att", no_arg, 'A' },
-    { "at", no_arg, 'A' },
-    { "numattrs", require_arg, 'a' },
-    { "numattr", require_arg, 'a' },
-    { "numatt", require_arg, 'a' },
-    { "numat", require_arg, 'a' },
-    { "numa", require_arg, 'a' },
-    { "num", require_arg, 'a' },
-    { "nu", require_arg, 'a' },
-    { "freespace", no_arg, 's' },
-    { "freespac", no_arg, 's' },
-    { "freespa", no_arg, 's' },
-    { "freesp", no_arg, 's' },
-    { "frees", no_arg, 's' },
-    { "free", no_arg, 's' },
-    { "fre", no_arg, 's' },
-    { "fr", no_arg, 's' },
-    { "summary", no_arg, 'S' },
-    { "summar", no_arg, 'S' },
-    { "summa", no_arg, 'S' },
-    { "summ", no_arg, 'S' },
-    { "sum", no_arg, 'S' },
-    { "su", no_arg, 'S' },
-    { NULL, 0, '\0' }
-};
-
-static void
-leave(int ret)
-{
-   h5tools_close();
-   HDexit(ret);
-}
-
-
-
-/*-------------------------------------------------------------------------
- * Function: usage
- *
- * Purpose: Compute the ceiling of log_10(x)
- *
- * Return: >0 on success, 0 on failure
- *
- *-------------------------------------------------------------------------
- */
-static void usage(const char *prog)
-{
-     HDfflush(stdout);
-     HDfprintf(stdout, "Usage: %s [OPTIONS] file\n", prog);
-     HDfprintf(stdout, "\n");
-     HDfprintf(stdout, "      OPTIONS\n");
-     HDfprintf(stdout, "     -h, --help            Print a usage message and exit\n");
-     HDfprintf(stdout, "     -V, --version         Print version number and exit\n");
-     HDfprintf(stdout, "     -f, --file            Print file information\n");
-     HDfprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
-     HDfprintf(stdout, "     -g, --group           Print group information\n");
-     HDfprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
-     HDfprintf(stdout, "                           information for small groups.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
-     HDfprintf(stdout, "     -d, --dset            Print dataset information\n");
-     HDfprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
-     HDfprintf(stdout, "                           information for small datasets.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
-     HDfprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
-     HDfprintf(stdout, "     -A, --attribute       Print attribute information\n");
-     HDfprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
-     HDfprintf(stdout, "                           information for small # of attributes.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -s, --freespace       Print free space information\n");
-     HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: ceil_log10
- *
- * Purpose: Compute the ceiling of log_10(x)
- *
- * Return: >0 on success, 0 on failure
- *
- * Programmer: Quincey Koziol
- *              Monday, August 22, 2005
- *
- *-------------------------------------------------------------------------
- */
-H5_ATTR_CONST static unsigned
-ceil_log10(unsigned long x)
-{
-    unsigned long pow10 = 1;
-    unsigned ret = 0;
-
-    while(x >= pow10) {
-        pow10 *= 10;
-        ret++;
-    } /* end while */
-
-    return ret;
-} /* ceil_log10() */
-
-
-/*-------------------------------------------------------------------------
- * Function: attribute_stats
- *
- * Purpose: Gather statistics about attributes on an object
- *
- * Return:  Success: 0
- *
- *          Failure: -1
- *
- * Programmer:    Quincey Koziol
- *                Tuesday, July 17, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-attribute_stats(iter_t *iter, const H5O_info_t *oi)
-{
-    unsigned     bin;               /* "bin" the number of objects falls in */
-
-    /* Update dataset & attribute metadata info */
-    iter->attrs_btree_storage_size += oi->meta_size.attr.index_size;
-    iter->attrs_heap_storage_size += oi->meta_size.attr.heap_size;
-
-    /* Update small # of attribute count & limits */
-    if(oi->num_attrs <= (hsize_t)sattrs_threshold)
-        (iter->num_small_attrs[(size_t)oi->num_attrs])++;
-    if(oi->num_attrs > iter->max_attrs)
-        iter->max_attrs = oi->num_attrs;
-
-    /* Add attribute count to proper bin */
-    bin = ceil_log10((unsigned long)oi->num_attrs);
-    if((bin + 1) > iter->attr_nbins) {
-  iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
-        HDassert(iter->attr_bins);
-
-  /* Initialize counts for intermediate bins */
-        while(iter->attr_nbins < bin)
-      iter->attr_bins[iter->attr_nbins++] = 0;
-        iter->attr_nbins++;
-
-        /* Initialize count for new bin */
-        iter->attr_bins[bin] = 1;
-     } /* end if */
-     else
-         (iter->attr_bins[bin])++;
-
-     return 0;
-} /* end attribute_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: group_stats
- *
- * Purpose: Gather statistics about the group
- *
- * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *             Tuesday, August 16, 2005
- *
- * Modifications: Refactored code from the walk_function
- *                EIP, Wednesday, August 16, 2006
- *
- *      Vailin Choi 12 July 2007
- *      1. Gathered storage info for btree and heap
- *         (groups and attributes)
- *      2. Gathered info for attributes
- *
- *      Vailin Choi 14 July 2007
- *      Cast "num_objs" and "num_attrs" to size_t
- *      Due to the -Mbounds problem for the pgi-32 bit compiler on indexing
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
-{
-    H5G_info_t     ginfo;                  /* Group information */
-    unsigned     bin;                     /* "bin" the number of objects falls in */
-    herr_t     ret;
-
-    /* Gather statistics about this type of object */
-    iter->uniq_groups++;
-
-    /* Get object header information */
-    iter->group_ohdr_info.total_size += oi->hdr.space.total;
-    iter->group_ohdr_info.free_size += oi->hdr.space.free;
-
-    /* Get group information */
-    ret = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT);
-    HDassert(ret >= 0);
-
-    /* Update link stats */
-    /* Collect statistics for small groups */
-    if(ginfo.nlinks < (hsize_t)sgroups_threshold)
-        (iter->num_small_groups[(size_t)ginfo.nlinks])++;
-    /* Determine maximum link count */
-    if(ginfo.nlinks > iter->max_fanout)
-        iter->max_fanout = ginfo.nlinks;
-
-    /* Add group count to proper bin */
-    bin = ceil_log10((unsigned long)ginfo.nlinks);
-    if((bin + 1) > iter->group_nbins) {
-        /* Allocate more storage for info about dataset's datatype */
-        iter->group_bins = (unsigned long *)HDrealloc(iter->group_bins, (bin + 1) * sizeof(unsigned long));
-        HDassert(iter->group_bins);
-
-  /* Initialize counts for intermediate bins */
-        while(iter->group_nbins < bin)
-            iter->group_bins[iter->group_nbins++] = 0;
-        iter->group_nbins++;
-
-        /* Initialize count for new bin */
-        iter->group_bins[bin] = 1;
-    } /* end if */
-    else
-        (iter->group_bins[bin])++;
-
-    /* Update group metadata info */
-    iter->groups_btree_storage_size += oi->meta_size.obj.index_size;
-    iter->groups_heap_storage_size += oi->meta_size.obj.heap_size;
-
-    /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
-
-    return 0;
-} /* end group_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: dataset_stats
- *
- * Purpose: Gather statistics about the dataset
- *
- * Return:  Success: 0
- *
- *          Failure: -1
- *
- * Programmer:    Quincey Koziol
- *                Tuesday, August 16, 2005
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
-{
-    unsigned     bin;               /* "bin" the number of objects falls in */
-    hid_t     did;               /* Dataset ID */
-    hid_t     sid;               /* Dataspace ID */
-    hid_t     tid;               /* Datatype ID */
-    hid_t     dcpl;              /* Dataset creation property list ID */
-    hsize_t     dims[H5S_MAX_RANK];/* Dimensions of dataset */
-    H5D_layout_t   lout;              /* Layout of dataset */
-    unsigned     type_found;        /* Whether the dataset's datatype was */
-                                         /* already found */
-    int     ndims;             /* Number of dimensions of dataset */
-    hsize_t     storage;           /* Size of dataset storage */
-    unsigned     u;                 /* Local index variable */
-    int     num_ext;           /* Number of external files for a dataset */
-    int     nfltr;             /* Number of filters for a dataset */
-    H5Z_filter_t  fltr;              /* Filter identifier */
-    herr_t     ret;
-
-    /* Gather statistics about this type of object */
-    iter->uniq_dsets++;
-
-    /* Get object header information */
-    iter->dset_ohdr_info.total_size += oi->hdr.space.total;
-    iter->dset_ohdr_info.free_size += oi->hdr.space.free;
-
-    did = H5Dopen2(iter->fid, name, H5P_DEFAULT);
-    HDassert(did > 0);
-
-    /* Update dataset metadata info */
-    iter->datasets_index_storage_size += oi->meta_size.obj.index_size;
-    iter->datasets_heap_storage_size += oi->meta_size.obj.heap_size;
-
-    /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
-
-    /* Get storage info */
-    storage = H5Dget_storage_size(did);
-
-    /* Gather layout statistics */
-    dcpl = H5Dget_create_plist(did);
-    HDassert(dcpl > 0);
-
-    lout = H5Pget_layout(dcpl);
-    HDassert(lout >= 0);
-
-    /* Object header's total size for H5D_COMPACT layout includes raw data size */
-    /* "storage" also includes H5D_COMPACT raw data size */
-    if(lout == H5D_COMPACT)
-        iter->dset_ohdr_info.total_size -= storage;
-
-    /* Track the layout type for dataset */
-    (iter->dset_layouts[lout])++;
-
-    /* Get the number of external files for the dataset */
-    num_ext = H5Pget_external_count(dcpl);
-    assert (num_ext >= 0);
-
-    /* Accumulate raw data size accordingly */
-    if(num_ext) {
-        iter->nexternal += (unsigned long)num_ext;
-        iter->dset_external_storage_size += (unsigned long)storage;
-    } else
-        iter->dset_storage_size += storage;
-
-    /* Gather dataspace statistics */
-    sid = H5Dget_space(did);
-    HDassert(sid > 0);
-
-    ndims = H5Sget_simple_extent_dims(sid, dims, NULL);
-    HDassert(ndims >= 0);
-
-    /* Check for larger rank of dataset */
-    if((unsigned)ndims > iter->max_dset_rank)
-        iter->max_dset_rank = (unsigned)ndims;
-
-    /* Track the number of datasets with each rank */
-    (iter->dset_rank_count[ndims])++;
-
-    /* Only gather dim size statistics on 1-D datasets */
-    if(ndims == 1) {
-	/* Determine maximum dimension size */
-	if(dims[0] > iter->max_dset_dims)
-	    iter->max_dset_dims = dims[0];
-	/* Collect statistics for small datasets */
-       if(dims[0] < (hsize_t)sdsets_threshold)
-           (iter->small_dset_dims[(size_t)dims[0]])++;
-
-       /* Add dim count to proper bin */
-       bin = ceil_log10((unsigned long)dims[0]);
-       if((bin + 1) > iter->dset_dim_nbins) {
-          /* Allocate more storage for info about dataset's datatype */
-          iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long));
-          HDassert(iter->dset_dim_bins);
-
-          /* Initialize counts for intermediate bins */
-          while(iter->dset_dim_nbins < bin)
-              iter->dset_dim_bins[iter->dset_dim_nbins++] = 0;
-          iter->dset_dim_nbins++;
-
-          /* Initialize count for this bin */
-          iter->dset_dim_bins[bin] = 1;
-        } /* end if */
-        else
-            (iter->dset_dim_bins[bin])++;
-    } /* end if */
-
-    ret = H5Sclose(sid);
-    HDassert(ret >= 0);
-
-    /* Gather datatype statistics */
-    tid = H5Dget_type(did);
-    HDassert(tid > 0);
-
-    type_found = FALSE;
-    for(u = 0; u < iter->dset_ntypes; u++)
-        if(H5Tequal(iter->dset_type_info[u].tid, tid) > 0) {
-            type_found = TRUE;
-            break;
-        } /* end for */
-    if(type_found)
-         (iter->dset_type_info[u].count)++;
-    else {
-        unsigned curr_ntype = (unsigned)iter->dset_ntypes;
-
-        /* Increment # of datatypes seen for datasets */
-        iter->dset_ntypes++;
-
-        /* Allocate more storage for info about dataset's datatype */
-        iter->dset_type_info = (dtype_info_t *)HDrealloc(iter->dset_type_info, iter->dset_ntypes * sizeof(dtype_info_t));
-        HDassert(iter->dset_type_info);
-
-        /* Initialize information about datatype */
-        iter->dset_type_info[curr_ntype].tid = H5Tcopy(tid);
-        HDassert(iter->dset_type_info[curr_ntype].tid > 0);
-        iter->dset_type_info[curr_ntype].count = 1;
-        iter->dset_type_info[curr_ntype].named = 0;
-
-        /* Set index for later */
-        u = curr_ntype;
-    } /* end else */
-
-    /* Check if the datatype is a named datatype */
-    if(H5Tcommitted(tid) > 0)
-        (iter->dset_type_info[u].named)++;
-
-    ret = H5Tclose(tid);
-    HDassert(ret >= 0);
-
-    /* Track different filters */
-    if((nfltr = H5Pget_nfilters(dcpl)) >= 0) {
-       if(nfltr == 0)
-           iter->dset_comptype[0]++;
-        for(u = 0; u < (unsigned)nfltr; u++) {
-            fltr = H5Pget_filter2(dcpl, u, 0, 0, 0, 0, 0, NULL);
-            if(fltr >= 0) {
-                if(fltr < (H5_NFILTERS_IMPL - 1))
-                    iter->dset_comptype[fltr]++;
-                else
-                    iter->dset_comptype[H5_NFILTERS_IMPL - 1]++; /*other filters*/
-            } /* end if */
-        } /* end for */
-    } /* endif nfltr */
-
-     ret = H5Pclose(dcpl);
-     HDassert(ret >= 0);
-
-     ret = H5Dclose(did);
-     HDassert(ret >= 0);
-
-     return 0;
-}  /* end dataset_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: datatype_stats
- *
- * Purpose: Gather statistics about the datatype
- *
- * Return:  Success: 0
- *          Failure: -1
- *
- * Programmer:    Vailin Choi; July 7th, 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-datatype_stats(iter_t *iter, const H5O_info_t *oi)
-{
-    herr_t ret;
-
-    /* Gather statistics about this type of object */
-    iter->uniq_dtypes++;
-
-    /* Get object header information */
-    iter->dtype_ohdr_info.total_size += oi->hdr.space.total;
-    iter->dtype_ohdr_info.free_size += oi->hdr.space.free;
-
-    /* Update attribute metadata info */
-    ret = attribute_stats(iter, oi);
-    HDassert(ret >= 0);
-
-     return 0;
-}  /* end datatype_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: obj_stats
- *
- * Purpose: Gather statistics about an object
- *
- * Return: Success: 0
- *       Failure: -1
- *
- * Programmer: Quincey Koziol
- *             Tuesday, November 6, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
-    void *_iter)
-{
-    iter_t *iter = (iter_t *)_iter;
-
-    /* If the object has already been seen then just return */
-    if(NULL == already_visited) {
-        /* Gather some general statistics about the object */
-        if(oi->rc > iter->max_links)
-            iter->max_links = oi->rc;
-
-        switch(oi->type) {
-            case H5O_TYPE_GROUP:
-                group_stats(iter, path, oi);
-                break;
-
-            case H5O_TYPE_DATASET:
-                dataset_stats(iter, path, oi);
-                break;
-
-            case H5O_TYPE_NAMED_DATATYPE:
-                datatype_stats(iter, oi);
-                break;
-
-            case H5O_TYPE_UNKNOWN:
-            case H5O_TYPE_NTYPES:
-            default:
-                /* Gather statistics about this type of object */
-                iter->uniq_others++;
-                break;
-        } /* end switch */
-    } /* end if */
-
-    return 0;
-} /* end obj_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: lnk_stats
- *
- * Purpose: Gather statistics about a link
- *
- * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *             Tuesday, November 6, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-lnk_stats(const char H5_ATTR_UNUSED *path, const H5L_info_t *li, void *_iter)
-{
-    iter_t *iter = (iter_t *)_iter;
-
-    switch(li->type) {
-        case H5L_TYPE_SOFT:
-        case H5L_TYPE_EXTERNAL:
-            /* Gather statistics about links and UD links */
-            iter->uniq_links++;
-            break;
-
-        case H5L_TYPE_HARD:
-        case H5L_TYPE_MAX:
-        case H5L_TYPE_ERROR:
-        default:
-            /* Gather statistics about this type of object */
-            iter->uniq_others++;
-            break;
-    } /* end switch() */
-
-    return 0;
-} /* end lnk_stats() */
-
-/*-------------------------------------------------------------------------
- * Function: freespace_stats
- *
- * Purpose: Gather statistics for free space sections in the file
- *
- * Return: Success: 0
- *       Failure: -1
- *
- * Programmer:  Vailin Choi; July 7th, 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-freespace_stats(hid_t fid, iter_t *iter)
-{
-    H5F_sect_info_t *sect_info = NULL;    /* Free space sections */
-    ssize_t   nsects;                   /* Number of free space sections */
-    size_t   u;                        /* Local index variable */
-
-    /* Query section information */
-    if((nsects = H5Fget_free_sections(fid, H5FD_MEM_DEFAULT, 0, NULL)) < 0)
-        return(FAIL);
-    else if(nsects) {
-        if(NULL == (sect_info = (H5F_sect_info_t *)HDcalloc((size_t)nsects, sizeof(H5F_sect_info_t))))
-            return(FAIL);
-        nsects = H5Fget_free_sections(fid, H5FD_MEM_DEFAULT, (size_t)nsects, sect_info);
-        HDassert(nsects);
-    } /* end else-if */
-
-    for(u = 0; u < (size_t)nsects; u++) {
-        unsigned   bin;       /* "bin" the number of objects falls in */
-
-        if(sect_info[u].size < SIZE_SMALL_SECTS)
-            (iter->num_small_sects[(size_t)sect_info[u].size])++;
-
-        /* Add section size to proper bin */
-        bin = ceil_log10((unsigned long)sect_info[u].size);
-        if(bin >= iter->sect_nbins) {
-            /* Allocate more storage for section info */
-            iter->sect_bins = (unsigned long *)HDrealloc(iter->sect_bins, (bin + 1) * sizeof(unsigned long));
-            HDassert(iter->sect_bins);
-
-            /* Initialize counts for intermediate bins */
-            while(iter->sect_nbins < bin)
-                iter->sect_bins[iter->sect_nbins++] = 0;
-            iter->sect_nbins++;
-
-            /* Initialize count for this bin */
-            iter->sect_bins[bin] = 1;
-        } /* end if */
-        else
-            (iter->sect_bins[bin])++;
-    } /* end for */
-
-    if(sect_info)
-        HDfree(sect_info);
-
-    return 0;
-} /* end freespace_stats() */
-
-
-/*-------------------------------------------------------------------------
- * Function: hand_free
- *
- * Purpose: Free handler structure
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- *-------------------------------------------------------------------------
- */
-static void
-hand_free(struct handler_t *hand)
-{
-    if(hand) {
-        unsigned u;
-
-        for(u = 0; u < hand->obj_count; u++)
-            if(hand->obj[u]) {
-                HDfree(hand->obj[u]);
-                hand->obj[u] = NULL;
-            } /* end if */
-        hand->obj_count = 0;
-        HDfree(hand->obj);
-        HDfree(hand);
-    } /* end if */
-} /* end hand_free() */
-
-
-/*-------------------------------------------------------------------------
- * Function: parse_command_line
- *
- * Purpose: Parses command line and sets up global variable to control output
- *
- * Return: Success: 0
- *
- * Failure: -1
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static int
-parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
-{
-    int                opt;
-    unsigned           u;
-    struct handler_t   *hand = NULL;
-
-    /* parse command line options */
-    while((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch((char)opt) {
-            case 'h':
-                usage(h5tools_getprogname());
-                h5tools_setstatus(EXIT_SUCCESS);
-                goto done;
-                break;
-
-            case 'V':
-                print_version(h5tools_getprogname());
-                h5tools_setstatus(EXIT_SUCCESS);
-                goto done;
-                break;
-
-            case 'F':
-                display_all = FALSE;
-                display_file_metadata = TRUE;
-                break;
-
-            case 'f':
-                display_all = FALSE;
-                display_file = TRUE;
-                break;
-
-            case 'G':
-                display_all = FALSE;
-                display_group_metadata = TRUE;
-                break;
-
-            case 'g':
-                display_all = FALSE;
-                display_group = TRUE;
-                break;
-
-            case 'l':
-		if(opt_arg) {
-		    sgroups_threshold = HDatoi(opt_arg);
-		    if(sgroups_threshold < 1) {
-			error_msg("Invalid threshold for small groups\n");
-			goto error;
-		    }
-		} else
-		    error_msg("Missing threshold for small groups\n");
-
-                break;
-
-            case 'D':
-                display_all = FALSE;
-                display_dset_metadata = TRUE;
-                break;
-
-            case 'd':
-                display_all = FALSE;
-                display_dset = TRUE;
-                break;
-
-            case 'm':
-		if(opt_arg) {
-		    sdsets_threshold = HDatoi(opt_arg);
-		    if(sdsets_threshold < 1) {
-			error_msg("Invalid threshold for small datasets\n");
-			goto error;
-		    }
-		} else
-		    error_msg("Missing threshold for small datasets\n");
-
-                break;
-
-            case 'T':
-                display_all = FALSE;
-                display_dset_dtype_meta = TRUE;
-                break;
-
-            case 'A':
-                display_all = FALSE;
-                display_attr = TRUE;
-                break;
-
-            case 'a':
-		if(opt_arg) {
-		    sattrs_threshold = HDatoi(opt_arg);
-		    if(sattrs_threshold < 1) {
-			error_msg("Invalid threshold for small # of attributes\n");
-			goto error;
-		    }
-		} else
-                    error_msg("Missing threshold for small # of attributes\n");
-
-                break;
-
-            case 's':
-                display_all = FALSE;
-                display_free_sections = TRUE;
-                break;
-
-            case 'S':
-                display_all = FALSE;
-                display_summary = TRUE;
-                break;
-
-            case 'O':
-                display_all = FALSE;
-                display_object = TRUE;
-
-                /* Allocate space to hold the command line info */
-                if(NULL == (hand = (struct handler_t *)HDcalloc((size_t)1, sizeof(struct handler_t)))) {
-                    error_msg("unable to allocate memory for object struct\n");
-                    goto error;
-                } /* end if */
-
-                /* Allocate space to hold the object strings */
-                hand->obj_count = (size_t)argc;
-                if(NULL == (hand->obj = (char **)HDcalloc((size_t)argc, sizeof(char *)))) {
-                    error_msg("unable to allocate memory for object array\n");
-                    goto error;
-                } /* end if */
-
-                /* Store object names */
-                for(u = 0; u < hand->obj_count; u++)
-                    if(NULL == (hand->obj[u] = HDstrdup(opt_arg))) {
-                        error_msg("unable to allocate memory for object name\n");
-                        goto error;
-                    } /* end if */
-                break;
-
-            default:
-                usage(h5tools_getprogname());
-                goto error;
-        } /* end switch */
-    } /* end while */
-
-    /* check for file name to be processed */
-    if(argc <= opt_ind) {
-        error_msg("missing file name\n");
-        usage(h5tools_getprogname());
-        goto error;
-    } /* end if */
-
-    /* Set handler structure */
-    *hand_ret = hand;
-
-done:
-    return 0;
-
-error:
-    hand_free(hand);
-    h5tools_setstatus(EXIT_FAILURE);
-
-    return -1;
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: iter_free
- *
- * Purpose: Free iter structure
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- *-------------------------------------------------------------------------
- */
-static void
-iter_free(iter_t *iter)
-{
-
-    /* Clear array of bins for group counts */
-    if(iter->group_bins) {
-        HDfree(iter->group_bins);
-        iter->group_bins = NULL;
-    } /* end if */
-
-    /* Clear array for tracking small groups */
-    if(iter->num_small_groups) {
-        HDfree(iter->num_small_groups);
-        iter->num_small_groups = NULL;
-    } /* end if */
-
-    /* Clear array of bins for attribute counts */
-    if(iter->attr_bins) {
-        HDfree(iter->attr_bins);
-        iter->attr_bins = NULL;
-    } /* end if */
-
-    /* Clear array for tracking small attributes */
-    if(iter->num_small_attrs) {
-        HDfree(iter->num_small_attrs);
-        iter->num_small_attrs= NULL;
-    } /* end if */
-
-    /* Clear dataset datatype information found */
-    if(iter->dset_type_info) {
-        HDfree(iter->dset_type_info);
-        iter->dset_type_info = NULL;
-    } /* end if */
-
-    /* Clear array of bins for dataset dimensions */
-    if(iter->dset_dim_bins) {
-        HDfree(iter->dset_dim_bins);
-        iter->dset_dim_bins = NULL;
-    } /* end if */
-
-    /* Clear array of tracking 1-D small datasets */
-    if(iter->small_dset_dims) {
-        HDfree(iter->small_dset_dims);
-        iter->small_dset_dims = NULL;
-    } /* end if */
-
-    /* Clear array of bins for free-space section sizes */
-    if(iter->sect_bins) {
-        HDfree(iter->sect_bins);
-        iter->sect_bins = NULL;
-    } /* end if */
-} /* end iter_free() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_file_info
- *
- * Purpose: Prints information about file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_file_info(const iter_t *iter)
-{
-    printf("File information\n");
-    printf("\t# of unique groups: %lu\n", iter->uniq_groups);
-    printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
-    printf("\t# of unique links: %lu\n", iter->uniq_links);
-    printf("\t# of unique other: %lu\n", iter->uniq_others);
-    printf("\tMax. # of links to object: %lu\n", iter->max_links);
-    HDfprintf(stdout, "\tMax. # of objects in group: %Hu\n", iter->max_fanout);
-
-    return 0;
-} /* print_file_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_file_metadata
- *
- * Purpose: Prints file space information for file's metadata
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_file_metadata(const iter_t *iter)
-{
-    HDfprintf(stdout, "File space information for file metadata (in bytes):\n");
-    HDfprintf(stdout, "\tSuperblock: %Hu\n", iter->super_size);
-    HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
-    HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
-
-    HDfprintf(stdout, "\tObject headers: (total/unused)\n");
-    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n",
-                iter->group_ohdr_info.total_size,
-    iter->group_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
-    iter->dset_ohdr_info.total_size,
-    iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n",
-                iter->dtype_ohdr_info.total_size,
-    iter->dtype_ohdr_info.free_size);
-
-    HDfprintf(stdout, "\tGroups:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->groups_heap_storage_size);
-
-    HDfprintf(stdout, "\tAttributes:\n");
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->attrs_btree_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
-
-    HDfprintf(stdout, "\tChunked datasets:\n");
-    HDfprintf(stdout, "\t\tIndex: %Hu\n", iter->datasets_index_storage_size);
-
-    HDfprintf(stdout, "\tDatasets:\n");
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->datasets_heap_storage_size);
-
-    HDfprintf(stdout, "\tShared Messages:\n");
-    HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
-    HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->SM_index_storage_size);
-    HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->SM_heap_storage_size);
-
-    HDfprintf(stdout, "\tFree-space managers:\n");
-    HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->free_hdr);
-    HDfprintf(stdout, "\t\tAmount of free space: %Hu\n", iter->free_space);
-
-    return 0;
-} /* print_file_metadata() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_group_info
- *
- * Purpose: Prints information about groups in the file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- * Modifications:
- *  bug #1253; Oct 6th 2008; Vailin Choi
- *  Fixed segmentation fault: print iter->group_bins[0] when
- *  there is iter->group_nbins
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_group_info(const iter_t *iter)
-{
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
-
-    printf("Small groups (with 0 to %u links):\n", sgroups_threshold-1);
-    total = 0;
-    for(u = 0; u < (unsigned)sgroups_threshold; u++) {
-        if(iter->num_small_groups[u] > 0) {
-            printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
-            total += iter->num_small_groups[u];
-        } /* end if */
-    } /* end for */
-    printf("\tTotal # of small groups: %lu\n", total);
-
-    printf("Group bins:\n");
-    total = 0;
-    if((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-       printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
-       total = iter->group_bins[0];
-    } /* end if */
-    power = 1;
-    for(u = 1; u < iter->group_nbins; u++) {
-        if(iter->group_bins[u] > 0) {
-           printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
-                    iter->group_bins[u]);
-           total += iter->group_bins[u];
-        } /* end if */
-        power *= 10;
-    } /* end for */
-    printf("\tTotal # of groups: %lu\n", total);
-
-    return 0;
-} /* print_group_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_group_metadata
- *
- * Purpose: Prints file space information for groups' metadata
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Vailin Choi; October 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_group_metadata(const iter_t *iter)
-{
-    printf("File space information for groups' metadata (in bytes):\n");
-
-    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-            iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
-
-    HDfprintf(stdout, "\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
-    HDfprintf(stdout, "\tHeap: %Hu\n", iter->groups_heap_storage_size);
-
-    return 0;
-} /* print_group_metadata() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_dataset_info
- *
- * Purpose: Prints information about datasets in the file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_dataset_info(const iter_t *iter)
-{
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
-
-    if(iter->uniq_dsets > 0) {
-        printf("Dataset dimension information:\n");
-        printf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
-        printf("\tDataset ranks:\n");
-        for(u = 0; u < H5S_MAX_RANK; u++)
-            if(iter->dset_rank_count[u] > 0)
-                printf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
-
-        printf("1-D Dataset information:\n");
-        HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %Hu\n", iter->max_dset_dims);
-        printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
-        total = 0;
-        for(u = 0; u < (unsigned)sdsets_threshold; u++) {
-            if(iter->small_dset_dims[u] > 0) {
-                printf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
-                         iter->small_dset_dims[u]);
-                total += iter->small_dset_dims[u];
-            } /* end if */
-        } /* end for */
-        printf("\t\tTotal # of small datasets: %lu\n", total);
-
-        /* Protect against no datasets in file */
-        if(iter->dset_dim_nbins > 0) {
-            printf("\t1-D Dataset dimension bins:\n");
-            total = 0;
-            if(iter->dset_dim_bins[0] > 0) {
-                printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
-                total = iter->dset_dim_bins[0];
-            } /* end if */
-            power = 1;
-            for(u = 1; u < iter->dset_dim_nbins; u++) {
-                if(iter->dset_dim_bins[u] > 0) {
-                    printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
-                             iter->dset_dim_bins[u]);
-                    total += iter->dset_dim_bins[u];
-                } /* end if */
-                power *= 10;
-            } /* end for */
-            printf("\t\tTotal # of datasets: %lu\n", total);
-        } /* end if */
-
-        printf("Dataset storage information:\n");
-        HDfprintf(stdout, "\tTotal raw data size: %Hu\n", iter->dset_storage_size);
-        HDfprintf(stdout, "\tTotal external raw data size: %Hu\n", iter->dset_external_storage_size);
-
-        printf("Dataset layout information:\n");
-        for(u = 0; u < H5D_NLAYOUTS; u++)
-        printf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
-                (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))), iter->dset_layouts[u]);
-        printf("\tNumber of external files : %lu\n", iter->nexternal);
-
-        printf("Dataset filters information:\n");
-        printf("\tNumber of datasets with:\n");
-        printf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
-        printf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
-        printf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
-        printf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
-        printf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
-        printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
-        printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
-        printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
-    } /* end if */
-
-    return 0;
-} /* print_dataset_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_dataset_metadata
- *
- * Purpose: Prints file space information for datasets' metadata
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer:  Vailin Choi; October 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_dset_metadata(const iter_t *iter)
-{
-    printf("File space information for datasets' metadata (in bytes):\n");
-
-    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
-
-    HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n",
-            iter->datasets_index_storage_size);
-    HDfprintf(stdout, "\tHeap: %Hu\n", iter->datasets_heap_storage_size);
-
-    return 0;
-} /* print_dset_metadata() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_dset_dtype_meta
- *
- * Purpose: Prints datasets' datatype information
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Vailin Choi; October 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_dset_dtype_meta(const iter_t *iter)
-{
-    unsigned long total;        /* Total count for various statistics */
-    size_t   dtype_size;        /* Size of encoded datatype */
-    unsigned u;                 /* Local index variable */
-
-    if(iter->dset_ntypes) {
-        printf("Dataset datatype information:\n");
-        printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
-        total = 0;
-        for(u = 0; u < iter->dset_ntypes; u++) {
-            H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-            printf("\tDataset datatype #%u:\n", u);
-            printf("\t\tCount (total/named) = (%lu/%lu)\n",
-                    iter->dset_type_info[u].count, iter->dset_type_info[u].named);
-            printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
-                    (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
-            H5Tclose(iter->dset_type_info[u].tid);
-            total += iter->dset_type_info[u].count;
-        } /* end for */
-        printf("\tTotal dataset datatype count: %lu\n", total);
-    } /* end if */
-
-    return 0;
-} /* print_dset_dtype_meta() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_attr_info
- *
- * Purpose: Prints information about attributes in the file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Vailin Choi
- *             July 12, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_attr_info(const iter_t *iter)
-{
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
-
-    printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
-    total = 0;
-    for(u = 1; u <= (unsigned)sattrs_threshold; u++) {
-        if(iter->num_small_attrs[u] > 0) {
-            printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
-            total += iter->num_small_attrs[u];
-        } /* end if */
-    } /* end for */
-    printf("\tTotal # of objects with small # of attributes: %lu\n", total);
-
-    printf("Attribute bins:\n");
-    total = 0;
-    power = 1;
-    for(u = 1; u < iter->attr_nbins; u++) {
-        if(iter->attr_bins[u] > 0) {
-           printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
-                    iter->attr_bins[u]);
-           total += iter->attr_bins[u];
-        } /* end if */
-        power *= 10;
-    } /* end for */
-    printf("\tTotal # of objects with attributes: %lu\n", total);
-    printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs);
-
-    return 0;
-} /* print_attr_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_freespace_info
- *
- * Purpose: Prints information about free space in the file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Vailin Choi; July 7th, 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_freespace_info(const iter_t *iter)
-{
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
-
-    HDfprintf(stdout, "Free-space section threshold: %Hu bytes\n", iter->fs_threshold);
-    printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS);
-    total = 0;
-    for(u = 0; u < SIZE_SMALL_SECTS; u++) {
-        if(iter->num_small_sects[u] > 0) {
-            printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]);
-            total += iter->num_small_sects[u];
-        } /* end if */
-    } /* end for */
-    printf("\tTotal # of small size sections: %lu\n", total);
-
-    printf("Free-space section bins:\n");
-
-    total = 0;
-    power = 1;
-    for(u = 1; u < iter->sect_nbins; u++) {
-        if(iter->sect_bins[u] > 0) {
-           printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1,
-                    iter->sect_bins[u]);
-           total += iter->sect_bins[u];
-        } /* end if */
-        power *= 10;
-    } /* end for */
-    printf("\tTotal # of sections: %lu\n", total);
-
-    return 0;
-} /* print_freespace_info() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_storage_summary
- *
- * Purpose: Prints file space information for the file
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Vailin Choi; August 2009
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-print_storage_summary(const iter_t *iter)
-{
-    hsize_t total_meta = 0;
-    hsize_t unaccount = 0;
-    double  percent = 0.0f;
-
-    HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]);
-    printf("Summary of file space information:\n");
-    total_meta =
-            iter->super_size + iter->super_ext_size + iter->ublk_size +
-            iter->group_ohdr_info.total_size +
-            iter->dset_ohdr_info.total_size +
-            iter->dtype_ohdr_info.total_size +
-            iter->groups_btree_storage_size +
-            iter->groups_heap_storage_size +
-            iter->attrs_btree_storage_size +
-            iter->attrs_heap_storage_size +
-            iter->datasets_index_storage_size +
-            iter->datasets_heap_storage_size +
-            iter->SM_hdr_storage_size +
-            iter->SM_index_storage_size +
-            iter->SM_heap_storage_size +
-            iter->free_hdr;
-
-    HDfprintf(stdout, "  File metadata: %Hu bytes\n", total_meta);
-    HDfprintf(stdout, "  Raw data: %Hu bytes\n", iter->dset_storage_size);
-
-    percent = ((double)iter->free_space / (double)iter->filesize) * (double)100.0f;
-    HDfprintf(stdout, "  Amount/Percent of tracked free space: %Hu bytes/%3.1f%\n",
-                iter->free_space, percent);
-
-    if(iter->filesize < (total_meta + iter->dset_storage_size + iter->free_space)) {
-        unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize;
-        HDfprintf(stdout, "  ??? File has %Hu more bytes accounted for than its size! ???\n", unaccount);
-    }
-    else {
-        unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space);
-        HDfprintf(stdout, "  Unaccounted space: %Hu bytes\n", unaccount);
-    }
-
-    HDfprintf(stdout, "Total space: %Hu bytes\n", total_meta + iter->dset_storage_size + iter->free_space + unaccount);
-
-    if(iter->nexternal)
-        HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size);
-
-    return 0;
-} /* print_storage_summary() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_file_statistics
- *
- * Purpose: Prints file statistics
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Saturday, August 12, 2006
- *
- *-------------------------------------------------------------------------
- */
-static void
-print_file_statistics(const iter_t *iter)
-{
-    if(display_all) {
-        display_file = TRUE;
-        display_group = TRUE;
-        display_dset = TRUE;
-        display_dset_dtype_meta = TRUE;
-        display_attr = TRUE;
-        display_free_sections = TRUE;
-        display_summary = TRUE;
-
-        display_file_metadata = TRUE;
-        display_group_metadata = TRUE;
-        display_dset_metadata = TRUE;
-    }
-
-    if(display_file)            print_file_info(iter);
-    if(display_file_metadata)   print_file_metadata(iter);
-
-    if(display_group)           print_group_info(iter);
-    if(!display_all && display_group_metadata)   print_group_metadata(iter);
-
-    if(display_dset)            print_dataset_info(iter);
-    if(display_dset_dtype_meta) print_dset_dtype_meta(iter);
-    if(!display_all && display_dset_metadata)   print_dset_metadata(iter);
-
-    if(display_attr)            print_attr_info(iter);
-    if(display_free_sections)   print_freespace_info(iter);
-    if(display_summary)         print_storage_summary(iter);
-} /* print_file_statistics() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_object_statistics
- *
- * Purpose: Prints object statistics
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Thursday, August 17, 2006
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static void
-print_object_statistics(const char *name)
-{
-    printf("Object name %s\n", name);
-} /* print_object_statistics() */
-
-
-/*-------------------------------------------------------------------------
- * Function: print_statistics
- *
- * Purpose: Prints statistics
- *
- * Return: Success: 0
- *
- * Failure: Never fails
- *
- * Programmer: Elena Pourmal
- *             Thursday, August 17, 2006
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static void
-print_statistics(const char *name, const iter_t *iter)
-{
-    if(display_object)
-        print_object_statistics(name);
-    else
-        print_file_statistics(iter);
-} /* print_statistics() */
-
-
-/*-------------------------------------------------------------------------
- * Function: main
- *
- * Modifications:
- *      2/2010; Vailin Choi
- *      Get the size of user block
- *
- *-------------------------------------------------------------------------
- */
-int
-main(int argc, const char *argv[])
-{
-    iter_t              iter;
-    const char         *fname = NULL;
-    hid_t               fid = -1;
-    struct handler_t   *hand = NULL;
-
-    h5tools_setprogname(PROGRAMNAME);
-    h5tools_setstatus(EXIT_SUCCESS);
-
-    /* Disable error reporting */
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
-    /* Initialize h5tools lib */
-    h5tools_init();
-    
-    HDmemset(&iter, 0, sizeof(iter));
-
-    if(parse_command_line(argc, argv, &hand) < 0)
-        goto done;
-
-    fname = argv[opt_ind];
-
-    /* Check for filename given */
-    if(fname) {
-        hid_t               fcpl;
-        H5F_info2_t         finfo;
-
-        printf("Filename: %s\n", fname);
-
-        fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-        if(fid < 0) {
-            error_msg("unable to open file \"%s\"\n", fname);
-            h5tools_setstatus(EXIT_FAILURE);
-            goto done;
-        } /* end if */
-
-        /* Initialize iter structure */
-        iter.fid = fid;
-
-        if(H5Fget_filesize(fid, &iter.filesize) < 0)
-            warn_msg("Unable to retrieve file size\n");
-        HDassert(iter.filesize != 0);
-
-        /* Get storge info for file-level structures */
-        if(H5Fget_info2(fid, &finfo) < 0)
-            warn_msg("Unable to retrieve file info\n");
-        else {
-            iter.super_size = finfo.super.super_size;
-            iter.super_ext_size = finfo.super.super_ext_size;
-            iter.SM_hdr_storage_size = finfo.sohm.hdr_size;
-            iter.SM_index_storage_size = finfo.sohm.msgs_info.index_size;
-            iter.SM_heap_storage_size = finfo.sohm.msgs_info.heap_size;
-            iter.free_space = finfo.free.tot_space;
-            iter.free_hdr = finfo.free.meta_size;
-        } /* end else */
-
-	iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-	iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
-	iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
-
-	if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
-	    error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
-            h5tools_setstatus(EXIT_FAILURE);
-	    goto done;
-	}
-
-        if((fcpl = H5Fget_create_plist(fid)) < 0)
-            warn_msg("Unable to retrieve file creation property\n");
-
-        if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
-            warn_msg("Unable to retrieve userblock size\n");
-
-        if(H5Pget_file_space(fcpl, &iter.fs_strategy, &iter.fs_threshold) < 0)
-            warn_msg("Unable to retrieve file space information\n");
-        HDassert(iter.fs_strategy != 0 && iter.fs_strategy < H5F_FILE_SPACE_NTYPES);
-
-        /* get information for free-space sections */
-        if(freespace_stats(fid, &iter) < 0)
-            warn_msg("Unable to retrieve freespace info\n");
-
-        /* Walk the objects or all file */
-        if(display_object) {
-            unsigned u;
-
-            for(u = 0; u < hand->obj_count; u++) {
-                if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-                    warn_msg("Unable to traverse object \"%s\"\n", hand->obj[u]);
-                else
-                    print_statistics(hand->obj[u], &iter);
-            } /* end for */
-        } /* end if */
-        else {
-            if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0)
-                warn_msg("Unable to traverse objects/links in file \"%s\"\n", fname);
-            else
-                print_statistics("/", &iter);
-        } /* end else */
-    } /* end if */
-
-done:
-    hand_free(hand);
-
-    /* Free iter structure */
-    iter_free(&iter);
-
-    if(fid >= 0 && H5Fclose(fid) < 0) {
-        error_msg("unable to close file \"%s\"\n", fname);
-        h5tools_setstatus(EXIT_FAILURE);
-    } /* end if */
-
-    leave(h5tools_getstatus());
-} /* end main() */
-
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
deleted file mode 100644
index b1ab168..0000000
--- a/tools/h5stat/h5stat_gentest.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * Generate the binary hdf5 files for the h5stat tests.
- * Usage: just execute the program without any arguments will
- * generate all the binary hdf5 files 
- *
- * If you regenerate the test files (e.g., changing some code,
- * trying it on a new platform, ...), you need to verify the correctness
- * of the expected output and update the corresponding *.ddl files.
- */
-#include "hdf5.h"
-
-/* For gen_newgrat_file() */
-#define NEWGRAT_FILE 	"h5stat_newgrat.h5"
-#define DATASET_NAME	"DATASET_NAME"
-#define GROUP_NAME	"GROUP"
-#define ATTR_NAME	"ATTR"
-#define NUM_GRPS 	35000
-#define NUM_ATTRS	100
-
-/* Declarations for gen_idx_file() */
-#define IDX_FILE 	"h5stat_idx.h5"
-#define DSET		"dset"
-#define DSET_FILTER	"dset_filter"
-
-/* For gen_threshold_file() */
-#define THRESHOLD_FILE 		"h5stat_threshold.h5"
-#define THRES_ATTR_NAME		"attr"
-#define THRES_ATTR_GRP_NAME	"grp_attr"
-#define THRES_DSET_NAME 	"dset"
-#define THRES_NUM		10
-#define THRES_NUM_25		25
-
-/*
- * Generate HDF5 file with latest format with
- * NUM_GRPS groups and NUM_ATTRS attributes for the dataset
- */
-static void 
-gen_newgrat_file(const char *fname)
-{
-    hid_t fcpl          = -1;   /* File creation property */
-    hid_t fapl          = -1;   /* File access property */
-    hid_t fid           = -1;   /* File id */
-    hid_t gid           = -1;   /* Group id */
-    hid_t tid           = -1;   /* Datatype id */
-    hid_t sid           = -1;   /* Dataspace id */
-    hid_t attr_id       = -1;   /* Attribute id */
-    hid_t did           = -1;   /* Dataset id */
-    char name[30];	/* Group name */
-    char attrname[30];	/* Attribute name */
-    int  i;		/* Local index variable */
-
-    /* Get a copy file access property list */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-	goto error;
-
-    /* Set to use latest library format */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-	goto error;
-
-    /* Get a copy of file creation property list */
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-	goto error;
-
-    /* Set file space handling strategy */
-    if(H5Pset_file_space(fcpl, H5F_FILE_SPACE_ALL_PERSIST, (hsize_t)0) < 0)
-	goto error;
-
-     /* Create file */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
-	goto error;
-
-    /* Create NUM_GRPS groups in the root group */
-    for(i = 1; i <= NUM_GRPS; i++) {
-        sprintf(name, "%s%d", GROUP_NAME,i);
-        if((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-        if(H5Gclose(gid) < 0)
-	    goto error;
-    } /* end for */
-
-    /* Create a datatype to commit and use */
-    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
-	goto error;
-
-    /* Create dataspace for dataset */
-    if((sid = H5Screate(H5S_SCALAR)) < 0)
-	goto error;
-
-    /* Create dataset */
-    if((did = H5Dcreate2(fid, DATASET_NAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create NUM_ATTRS for the dataset */
-    for(i = 1; i <= NUM_ATTRS; i++) {
-        sprintf(attrname, "%s%d", ATTR_NAME,i);
-        if((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-        if(H5Aclose(attr_id) < 0)
-	    goto error;
-    } /* end for */
-
-    /* Close dataset, dataspace, datatype, file */
-    if(H5Pclose(fapl) < 0)
-	goto error;
-    if(H5Pclose(fcpl) < 0)
-	goto error;
-    if(H5Dclose(did) < 0)
-	goto error;
-    if(H5Sclose(sid) < 0)
-	goto error;
-    if(H5Tclose(tid) < 0)
-	goto error;
-    if(H5Fclose(fid) < 0)
-	goto error;
-
-error:
-    H5E_BEGIN_TRY {
-	H5Pclose(fapl);
-	H5Pclose(fcpl);
-	H5Aclose(attr_id);
-        H5Dclose(did);
-        H5Tclose(tid);
-        H5Sclose(sid);
-        H5Gclose(gid);
-        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.
- *	-m N (--dims=N): Set the threshold for the # of dimension sizes when printing information for small datasets.
- *	-a N (--numattrs=N): Set the threshold for the # of attributes when printing information for small # of attributes.
- */
-static void
-gen_threshold_file(const char *fname)
-{
-    hid_t fid;				/* File ID */
-    hid_t sid0, sid1, sid2, sid3, sid4;	/* Dataspace IDs */
-    hid_t did;				/* Dataset ID */
-    hid_t attr_id;			/* Attribute ID */
-    hid_t gid;				/* Group ID */
-    hsize_t two_dims[] = {2, 5};	/* Dimension array */
-    hsize_t one_dims[] = {6};		/* Dimension array */
-    hsize_t zero_dims[] = {0};		/* Dimension array */
-    char name[30];			/* Name */
-    unsigned i;				/* Local index variable */
-
-    /* Create file */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create 1-D dataspace with zero dimension size */
-    if((sid0 = H5Screate_simple(1, zero_dims, NULL)) < 0)
-	goto error;
-
-    /* Create 1-D dataspace with non-zero dimension size*/
-    if((sid1 = H5Screate_simple(1, one_dims, NULL)) < 0)
-	goto error;
-
-    /* Create 2-D dataspace */
-    if((sid2 = H5Screate_simple(2, two_dims, NULL)) < 0)
-	goto error;
-
-    /* Create scalar dataspace */
-    if((sid3 = H5Screate(H5S_SCALAR)) < 0)
-	goto error;
-
-    /* Create null dataspace */
-    if((sid4 = H5Screate(H5S_NULL)) < 0)
-	goto error;
-
-    /* Create an attribute for the root group */
-    if((attr_id = H5Acreate2(fid, "attr", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-    if(H5Aclose(attr_id) < 0)
-	goto error;
-
-    /* Create 1-D dataset with zero dimension size for the root group */
-    if((did = H5Dcreate2(fid, "zero_dset", H5T_NATIVE_UCHAR, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create 11 attributes for the dataset */
-    for(i = 1; i <= (THRES_NUM+1); i++) {
-        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
-        if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-        if(H5Aclose(attr_id) < 0)
-	    goto error;
-    }
-    if(H5Dclose(did) < 0)
-	goto error;
-
-    /* Create dataset with scalar dataspace for the root group */
-    if((did = H5Dcreate2(fid, "scalar_dset", H5T_NATIVE_UCHAR, sid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-    if(H5Dclose(did) < 0)
-	goto error;
-
-    /* Create dataset with null dataspace for the root group */
-    if((did = H5Dcreate2(fid, "null_dset", H5T_NATIVE_UCHAR, sid4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-    if(H5Dclose(did) < 0)
-	goto error;
-
-    /* Create 2-D dataset for the root group */
-    if((did = H5Dcreate2(fid, "dset", H5T_NATIVE_UCHAR, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create 10 attributes for the 2-D dataset */
-    for(i = 1; i <= THRES_NUM; i++) {
-        sprintf(name, "%s%d", THRES_ATTR_NAME,i);
-        if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-        if(H5Aclose(attr_id) < 0)
-	    goto error;
-    }
-    if(H5Dclose(did) < 0)
-	goto error;
-
-    /* Create first group */
-    if((gid = H5Gcreate2(fid, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create an attribute for the group */
-    if((attr_id = H5Acreate2(gid, "ATTR", H5T_NATIVE_INT, sid3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Close attribute */
-    if(H5Aclose(attr_id) < 0)
-	goto error;
-
-    /* Create 10 1-D datasets with non-zero dimension size for the group */
-    for(i = 1; i <= THRES_NUM; i++) {
-	/* set up dataset name */
-        sprintf(name, "%s%d", THRES_DSET_NAME,i);
-
-	/* Create the dataset */
-	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-
-	/* Close the dataset */
-        if(H5Dclose(did) < 0)
-	    goto error;
-    }
-
-    /* Close the group */
-    if(H5Gclose(gid) < 0)
-	goto error;
-
-
-    /* Create second group */
-    if((gid = H5Gcreate2(fid, "group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create 25 attributes for the group */
-    for(i = 1; i <= THRES_NUM_25; i++) {
-	/* Set up attribute name */
-        sprintf(name, "%s%d", THRES_ATTR_GRP_NAME,i);
-
-	/* Create the attribute */
-        if((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-
-	/* Close the attribute */
-        if(H5Aclose(attr_id) < 0)
-	    goto error;
-    }
-
-    /* Close the group */
-    if(H5Gclose(gid) < 0)
-	goto error;
-
-    /* Create third group */
-    if((gid = H5Gcreate2(fid, "group3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
-
-    /* Create 9 1-D datasets with non-zero dimension size for the group */
-    for(i = 1; i < THRES_NUM; i++) {
-	/* set up dataset name */
-        sprintf(name, "%s%d", THRES_DSET_NAME,i);
-
-	/* Create the dataset */
-	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
-
-	/* Close the dataset */
-        if(H5Dclose(did) < 0)
-	    goto error;
-    }
-
-    /* Close the group */
-    if(H5Gclose(gid) < 0)
-	goto error;
-
-
-    /* Close dataspaces */
-    if(H5Sclose(sid0) < 0)
-	goto error;
-    if(H5Sclose(sid1) < 0)
-	goto error;
-    if(H5Sclose(sid2) < 0)
-	goto error;
-    if(H5Sclose(sid3) < 0)
-	goto error;
-    if(H5Sclose(sid4) < 0)
-	goto error;
-
-    /* Close file */
-    if(H5Fclose(fid) < 0)
-	goto error;
-
-error:
-    H5E_BEGIN_TRY {
-        H5Gclose(gid);
-	H5Aclose(attr_id);
-        H5Dclose(did);
-        H5Sclose(sid0);
-        H5Sclose(sid1);
-        H5Sclose(sid2);
-        H5Sclose(sid3);
-        H5Sclose(sid4);
-        H5Fclose(fid);
-    } H5E_END_TRY;
-
-} /* gen_threshold_file() */
-
-/*
- * Function: gen_idx_file
- *
- * Purpose: Create a file with datasets that use Fixed Array indexing:
- *   	one dataset: fixed dimension, chunked layout, w/o filters
- *     	one dataset: fixed dimension, chunked layout, w/ filters
- *
- */
-static void 
-gen_idx_file(const char *fname)
-{
-    hid_t	fapl = -1;		    /* file access property id */
-    hid_t	fid = -1;	            /* file id */
-    hid_t   	sid = -1;	            /* space id */
-    hid_t	dcpl = -1;	    	    /* dataset creation property id */
-    hid_t	did = -1, did2 = -1;	    /* dataset id */
-    hsize_t 	dims[1] = {10};     /* dataset dimension */
-    hsize_t 	c_dims[1] = {2};    /* chunk dimension */
-    int		i;		    /* local index variable */
-    int     	buf[10];            /* data buffer */
-
-    /* Get a copy of the file access property */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-	goto error;
-
-    /* Set the "use the latest format" bounds for creating objects in the file */
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-	goto error;
-
-    /* Create file */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
-
-    /* Create data */
-    for(i = 0; i < 10; i++)
-	buf[i] = i;
-
-    /* Set chunk */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-	goto error;
-
-    if(H5Pset_chunk(dcpl, 1, c_dims) < 0)
-	goto error;
-
-    /* Create a 1D dataset */
-    if((sid = H5Screate_simple(1, dims, NULL)) < 0)
-	goto error;
-    if((did  = H5Dcreate2(fid, DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto error;
-    
-    /* Write to the dataset */
-    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-	goto error;
-
-#if defined (H5_HAVE_FILTER_DEFLATE)
-    /* set deflate data */
-    if(H5Pset_deflate(dcpl, 9) < 0)
-	goto error;
-
-    /* Create and write the dataset */
-    if((did2  = H5Dcreate2(fid, DSET_FILTER, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto error;
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-	goto error;
-
-    /* Close the dataset */
-    if(H5Dclose(did2) < 0)
-	goto error;
-#endif
-
-    /* closing: dataspace, dataset, file */
-    if(H5Pclose(fapl) < 0)
-	goto error;
-    if(H5Pclose(dcpl) < 0)
-	goto error;
-    if(H5Sclose(sid) < 0)
-	goto error;
-    if(H5Dclose(did) < 0)
-	goto error;
-    if(H5Fclose(fid) < 0)
-	goto error;
-
-error:
-    H5E_BEGIN_TRY {
-        H5Pclose(fapl);
-        H5Pclose(dcpl);
-        H5Sclose(sid);
-        H5Dclose(did);
-        H5Fclose(fid);
-#if defined (H5_HAVE_FILTER_DEFLATE)
-        H5Dclose(did2);
-#endif
-    } H5E_END_TRY;
-
-} /* gen_idx_file() */
-
-int main(void)
-{
-    gen_newgrat_file(NEWGRAT_FILE);
-    gen_threshold_file(THRESHOLD_FILE);
-
-    /* Generate an HDF file to test for datasets with Fixed Array indexing */
-    gen_idx_file(IDX_FILE);
-
-    return 0;
-}
-
diff --git a/tools/h5stat/testfiles/h5stat_dims1.ddl b/tools/h5stat/testfiles/h5stat_dims1.ddl
deleted file mode 100644
index 07b2900..0000000
--- a/tools/h5stat/testfiles/h5stat_dims1.ddl
+++ /dev/null
@@ -1,45 +0,0 @@
-Filename: h5stat_threshold.h5
-Small groups (with 0 to 9 links):
-	# of groups with 0 link(s): 1
-	# of groups with 7 link(s): 1
-	# of groups with 9 link(s): 1
-	Total # of small groups: 3
-Group bins:
-	# of groups with 0 link: 1
-	# of groups with 1 - 9 links: 2
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 4
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 0: 2
-		# of dataset with rank 1: 20
-		# of dataset with rank 2: 1
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 6
-	Small 1-D datasets (with dimension sizes 0 to 4):
-		# of datasets with dimension sizes 0: 1
-		Total # of small datasets: 1
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 0: 1
-		# of datasets with dimension size 1 - 9: 19
-		Total # of datasets: 20
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 23
-	Dataset layout counts[CHUNKED]: 0
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 23
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
diff --git a/tools/h5stat/testfiles/h5stat_dims2.ddl b/tools/h5stat/testfiles/h5stat_dims2.ddl
deleted file mode 100644
index dbccd05..0000000
--- a/tools/h5stat/testfiles/h5stat_dims2.ddl
+++ /dev/null
@@ -1,36 +0,0 @@
-Filename: h5stat_threshold.h5
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 0: 2
-		# of dataset with rank 1: 20
-		# of dataset with rank 2: 1
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 6
-	Small 1-D datasets (with dimension sizes 0 to 14):
-		# of datasets with dimension sizes 0: 1
-		# of datasets with dimension sizes 6: 19
-		Total # of small datasets: 20
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 0: 1
-		# of datasets with dimension size 1 - 9: 19
-		Total # of datasets: 20
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 23
-	Dataset layout counts[CHUNKED]: 0
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 23
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
diff --git a/tools/h5stat/testfiles/h5stat_err1_dims.ddl b/tools/h5stat/testfiles/h5stat_err1_dims.ddl
deleted file mode 100644
index 86d375b..0000000
--- a/tools/h5stat/testfiles/h5stat_err1_dims.ddl
+++ /dev/null
@@ -1 +0,0 @@
-h5stat error: Invalid threshold for small datasets
diff --git a/tools/h5stat/testfiles/h5stat_err1_links.ddl b/tools/h5stat/testfiles/h5stat_err1_links.ddl
deleted file mode 100644
index d43207c..0000000
--- a/tools/h5stat/testfiles/h5stat_err1_links.ddl
+++ /dev/null
@@ -1 +0,0 @@
-h5stat error: Invalid threshold for small groups
diff --git a/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
deleted file mode 100644
index 01b6c18..0000000
--- a/tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
+++ /dev/null
@@ -1 +0,0 @@
-h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl b/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
deleted file mode 100644
index 01b6c18..0000000
--- a/tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
+++ /dev/null
@@ -1 +0,0 @@
-h5stat error: Invalid threshold for small # of attributes
diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl
deleted file mode 100644
index d44445b..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-F.ddl
+++ /dev/null
@@ -1,26 +0,0 @@
-Filename: h5stat_filters.h5
-File space information for file metadata (in bytes):
-	Superblock: 96
-	Superblock extension: 0
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 48/8
-		Datasets(exclude compact data): 4136/1344
-		Datatypes: 80/0
-	Groups:
-		B-tree/List: 1200
-		Heap: 288
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 31392
-	Datasets:
-		Heap: 72
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
diff --git a/tools/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/h5stat/testfiles/h5stat_filters-UD.ddl
deleted file mode 100644
index 4efafd1..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-UD.ddl
+++ /dev/null
@@ -1,5 +0,0 @@
-Filename: h5stat_filters.h5
-File space information for datasets' metadata (in bytes):
-	Object headers (total/unused): 4136/1344
-	Index for Chunked datasets: 31392
-	Heap: 72
diff --git a/tools/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/h5stat/testfiles/h5stat_filters-UT.ddl
deleted file mode 100644
index d8de31f..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-UT.ddl
+++ /dev/null
@@ -1,10 +0,0 @@
-Filename: h5stat_filters.h5
-Dataset datatype information:
-	# of unique datatypes used by datasets: 2
-	Dataset datatype #0:
-		Count (total/named) = (14/0)
-		Size (desc./elmt) = (14/4)
-	Dataset datatype #1:
-		Count (total/named) = (1/0)
-		Size (desc./elmt) = (14/4)
-	Total dataset datatype count: 15
diff --git a/tools/h5stat/testfiles/h5stat_filters-d.ddl b/tools/h5stat/testfiles/h5stat_filters-d.ddl
deleted file mode 100644
index 6e6dd61..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-d.ddl
+++ /dev/null
@@ -1,32 +0,0 @@
-Filename: h5stat_filters.h5
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 1: 1
-		# of dataset with rank 2: 14
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 100 - 999: 1
-		Total # of datasets: 1
-Dataset storage information:
-	Total raw data size: 8659
-	Total external raw data size: 400
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 1
-	Dataset layout counts[CONTIG]: 2
-	Dataset layout counts[CHUNKED]: 12
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 2
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 7
-		GZIP filter: 2
-		SHUFFLE filter: 2
-		FLETCHER32 filter: 2
-		SZIP filter: 2
-		NBIT filter: 2
-		SCALEOFFSET filter: 1
-		USER-DEFINED filter: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/h5stat/testfiles/h5stat_filters-dT.ddl
deleted file mode 100644
index b14ca9f..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-dT.ddl
+++ /dev/null
@@ -1,41 +0,0 @@
-Filename: h5stat_filters.h5
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 1: 1
-		# of dataset with rank 2: 14
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 100 - 999: 1
-		Total # of datasets: 1
-Dataset storage information:
-	Total raw data size: 8659
-	Total external raw data size: 400
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 1
-	Dataset layout counts[CONTIG]: 2
-	Dataset layout counts[CHUNKED]: 12
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 2
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 7
-		GZIP filter: 2
-		SHUFFLE filter: 2
-		FLETCHER32 filter: 2
-		SZIP filter: 2
-		NBIT filter: 2
-		SCALEOFFSET filter: 1
-		USER-DEFINED filter: 1
-Dataset datatype information:
-	# of unique datatypes used by datasets: 2
-	Dataset datatype #0:
-		Count (total/named) = (14/0)
-		Size (desc./elmt) = (14/4)
-	Dataset datatype #1:
-		Count (total/named) = (1/0)
-		Size (desc./elmt) = (14/4)
-	Total dataset datatype count: 15
diff --git a/tools/h5stat/testfiles/h5stat_filters-file.ddl b/tools/h5stat/testfiles/h5stat_filters-file.ddl
deleted file mode 100644
index 5f7eff9..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-file.ddl
+++ /dev/null
@@ -1,9 +0,0 @@
-Filename: h5stat_filters.h5
-File information
-	# of unique groups: 1
-	# of unique datasets: 15
-	# of unique named datatypes: 1
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 16
diff --git a/tools/h5stat/testfiles/h5stat_filters-g.ddl b/tools/h5stat/testfiles/h5stat_filters-g.ddl
deleted file mode 100644
index 290c82a..0000000
--- a/tools/h5stat/testfiles/h5stat_filters-g.ddl
+++ /dev/null
@@ -1,6 +0,0 @@
-Filename: h5stat_filters.h5
-Small groups (with 0 to 9 links):
-	Total # of small groups: 0
-Group bins:
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
deleted file mode 100644
index 1a4fd72..0000000
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ /dev/null
@@ -1,97 +0,0 @@
-Filename: h5stat_filters.h5
-File information
-	# of unique groups: 1
-	# of unique datasets: 15
-	# of unique named datatypes: 1
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 16
-File space information for file metadata (in bytes):
-	Superblock: 96
-	Superblock extension: 0
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 48/8
-		Datasets(exclude compact data): 4136/1344
-		Datatypes: 80/0
-	Groups:
-		B-tree/List: 1200
-		Heap: 288
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 31392
-	Datasets:
-		Heap: 72
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
-Small groups (with 0 to 9 links):
-	Total # of small groups: 0
-Group bins:
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 1
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 1: 1
-		# of dataset with rank 2: 14
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 100
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 100 - 999: 1
-		Total # of datasets: 1
-Dataset storage information:
-	Total raw data size: 8659
-	Total external raw data size: 400
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 1
-	Dataset layout counts[CONTIG]: 2
-	Dataset layout counts[CHUNKED]: 12
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 2
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 7
-		GZIP filter: 2
-		SHUFFLE filter: 2
-		FLETCHER32 filter: 2
-		SZIP filter: 2
-		NBIT filter: 2
-		SCALEOFFSET filter: 1
-		USER-DEFINED filter: 1
-Dataset datatype information:
-	# of unique datatypes used by datasets: 2
-	Dataset datatype #0:
-		Count (total/named) = (14/0)
-		Size (desc./elmt) = (14/4)
-	Dataset datatype #1:
-		Count (total/named) = (1/0)
-		Size (desc./elmt) = (14/4)
-	Total dataset datatype count: 15
-Small # of attributes (objects with 1 to 10 attributes):
-	Total # of objects with small # of attributes: 0
-Attribute bins:
-	Total # of objects with attributes: 0
-	Max. # of attributes to objects: 0
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	Total # of small size sections: 0
-Free-space section bins:
-	Total # of sections: 0
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 37312 bytes
-  Raw data: 8659 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 301 bytes
-Total space: 46272 bytes
-External raw data: 400 bytes
diff --git a/tools/h5stat/testfiles/h5stat_filters.h5 b/tools/h5stat/testfiles/h5stat_filters.h5
deleted file mode 100644
index 5b5f4bb..0000000
--- a/tools/h5stat/testfiles/h5stat_filters.h5
+++ /dev/null
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
deleted file mode 100644
index d2a8715..0000000
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ /dev/null
@@ -1,24 +0,0 @@
-Usage: h5stat [OPTIONS] file
-
-      OPTIONS
-     -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
-     -f, --file            Print file information
-     -F, --filemetadata    Print file space information for file's metadata
-     -g, --group           Print group information
-     -l N, --links=N       Set the threshold for the # of links when printing
-                           information for small groups.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -G, --groupmetadata   Print file space information for groups' metadata
-     -d, --dset            Print dataset information
-     -m N, --dims=N        Set the threshold for the dimension sizes when printing
-                           information for small datasets.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -D, --dsetmetadata    Print file space information for datasets' metadata
-     -T, --dtypemetadata   Print datasets' datatype information
-     -A, --attribute       Print attribute information
-     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
-                           information for small # of attributes.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -s, --freespace       Print free space information
-     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
deleted file mode 100644
index d2a8715..0000000
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ /dev/null
@@ -1,24 +0,0 @@
-Usage: h5stat [OPTIONS] file
-
-      OPTIONS
-     -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
-     -f, --file            Print file information
-     -F, --filemetadata    Print file space information for file's metadata
-     -g, --group           Print group information
-     -l N, --links=N       Set the threshold for the # of links when printing
-                           information for small groups.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -G, --groupmetadata   Print file space information for groups' metadata
-     -d, --dset            Print dataset information
-     -m N, --dims=N        Set the threshold for the dimension sizes when printing
-                           information for small datasets.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -D, --dsetmetadata    Print file space information for datasets' metadata
-     -T, --dtypemetadata   Print datasets' datatype information
-     -A, --attribute       Print attribute information
-     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
-                           information for small # of attributes.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -s, --freespace       Print free space information
-     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_idx.ddl b/tools/h5stat/testfiles/h5stat_idx.ddl
deleted file mode 100644
index b26f1a4..0000000
--- a/tools/h5stat/testfiles/h5stat_idx.ddl
+++ /dev/null
@@ -1,93 +0,0 @@
-Filename: h5stat_idx.h5
-File information
-	# of unique groups: 1
-	# of unique datasets: 2
-	# of unique named datatypes: 0
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 2
-File space information for file metadata (in bytes):
-	Superblock: 48
-	Superblock extension: 0
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 147/47
-		Datasets(exclude compact data): 568/362
-		Datatypes: 0/0
-	Groups:
-		B-tree/List: 0
-		Heap: 0
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 202
-	Datasets:
-		Heap: 0
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
-Small groups (with 0 to 9 links):
-	# of groups with 2 link(s): 1
-	Total # of small groups: 1
-Group bins:
-	# of groups with 1 - 9 links: 1
-	Total # of groups: 1
-Dataset dimension information:
-	Max. rank of datasets: 1
-	Dataset ranks:
-		# of dataset with rank 1: 2
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 10
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 10 - 99: 2
-		Total # of datasets: 2
-Dataset storage information:
-	Total raw data size: 110
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 0
-	Dataset layout counts[CHUNKED]: 2
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 1
-		GZIP filter: 1
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
-Dataset datatype information:
-	# of unique datatypes used by datasets: 1
-	Dataset datatype #0:
-		Count (total/named) = (2/0)
-		Size (desc./elmt) = (14/4)
-	Total dataset datatype count: 2
-Small # of attributes (objects with 1 to 10 attributes):
-	Total # of objects with small # of attributes: 0
-Attribute bins:
-	Total # of objects with attributes: 0
-	Max. # of attributes to objects: 0
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	Total # of small size sections: 0
-Free-space section bins:
-	Total # of sections: 0
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 965 bytes
-  Raw data: 110 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 1131 bytes
-Total space: 2206 bytes
diff --git a/tools/h5stat/testfiles/h5stat_idx.h5 b/tools/h5stat/testfiles/h5stat_idx.h5
deleted file mode 100644
index 303d1f8..0000000
--- a/tools/h5stat/testfiles/h5stat_idx.h5
+++ /dev/null
diff --git a/tools/h5stat/testfiles/h5stat_links1.ddl b/tools/h5stat/testfiles/h5stat_links1.ddl
deleted file mode 100644
index c650f15..0000000
--- a/tools/h5stat/testfiles/h5stat_links1.ddl
+++ /dev/null
@@ -1,10 +0,0 @@
-Filename: h5stat_threshold.h5
-Small groups (with 0 to 7 links):
-	# of groups with 0 link(s): 1
-	# of groups with 7 link(s): 1
-	Total # of small groups: 2
-Group bins:
-	# of groups with 0 link: 1
-	# of groups with 1 - 9 links: 2
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_links2.ddl b/tools/h5stat/testfiles/h5stat_links2.ddl
deleted file mode 100644
index 4622884..0000000
--- a/tools/h5stat/testfiles/h5stat_links2.ddl
+++ /dev/null
@@ -1,105 +0,0 @@
-Filename: h5stat_threshold.h5
-File information
-	# of unique groups: 4
-	# of unique datasets: 23
-	# of unique named datatypes: 0
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 10
-File space information for file metadata (in bytes):
-	Superblock: 96
-	Superblock extension: 0
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 3576/0
-		Datasets(exclude compact data): 7896/2912
-		Datatypes: 0/0
-	Groups:
-		B-tree/List: 3816
-		Heap: 744
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 0
-	Datasets:
-		Heap: 0
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
-Small groups (with 0 to 7 links):
-	# of groups with 0 link(s): 1
-	# of groups with 7 link(s): 1
-	Total # of small groups: 2
-Group bins:
-	# of groups with 0 link: 1
-	# of groups with 1 - 9 links: 2
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 4
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 0: 2
-		# of dataset with rank 1: 20
-		# of dataset with rank 2: 1
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 6
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		# of datasets with dimension sizes 0: 1
-		# of datasets with dimension sizes 6: 19
-		Total # of small datasets: 20
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 0: 1
-		# of datasets with dimension size 1 - 9: 19
-		Total # of datasets: 20
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 23
-	Dataset layout counts[CHUNKED]: 0
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 23
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
-Dataset datatype information:
-	# of unique datatypes used by datasets: 1
-	Dataset datatype #0:
-		Count (total/named) = (23/0)
-		Size (desc./elmt) = (14/1)
-	Total dataset datatype count: 23
-Small # of attributes (objects with 1 to 10 attributes):
-	# of objects with 1 attributes: 2
-	# of objects with 10 attributes: 1
-	Total # of objects with small # of attributes: 3
-Attribute bins:
-	# of objects with 1 - 9 attributes: 2
-	# of objects with 10 - 99 attributes: 3
-	Total # of objects with attributes: 5
-	Max. # of attributes to objects: 25
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	Total # of small size sections: 0
-Free-space section bins:
-	Total # of sections: 0
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 16128 bytes
-  Raw data: 0 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 184 bytes
-Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_links3.ddl b/tools/h5stat/testfiles/h5stat_links3.ddl
deleted file mode 100644
index f80471a..0000000
--- a/tools/h5stat/testfiles/h5stat_links3.ddl
+++ /dev/null
@@ -1,12 +0,0 @@
-Filename: h5stat_threshold.h5
-Small groups (with 0 to 19 links):
-	# of groups with 0 link(s): 1
-	# of groups with 7 link(s): 1
-	# of groups with 9 link(s): 1
-	# of groups with 10 link(s): 1
-	Total # of small groups: 4
-Group bins:
-	# of groups with 0 link: 1
-	# of groups with 1 - 9 links: 2
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 4
diff --git a/tools/h5stat/testfiles/h5stat_links4.ddl b/tools/h5stat/testfiles/h5stat_links4.ddl
deleted file mode 100644
index 94feffd..0000000
--- a/tools/h5stat/testfiles/h5stat_links4.ddl
+++ /dev/null
@@ -1,8 +0,0 @@
-Filename: h5stat_newgrat.h5
-Small groups (with 0 to 9 links):
-	# of groups with 0 link(s): 35000
-	Total # of small groups: 35000
-Group bins:
-	# of groups with 0 link: 35000
-	# of groups with 10000 - 99999 links: 1
-	Total # of groups: 35001
diff --git a/tools/h5stat/testfiles/h5stat_links5.ddl b/tools/h5stat/testfiles/h5stat_links5.ddl
deleted file mode 100644
index 6f33bed..0000000
--- a/tools/h5stat/testfiles/h5stat_links5.ddl
+++ /dev/null
@@ -1,9 +0,0 @@
-Filename: h5stat_newgrat.h5
-Small groups (with 0 to 39999 links):
-	# of groups with 0 link(s): 35000
-	# of groups with 35001 link(s): 1
-	Total # of small groups: 35001
-Group bins:
-	# of groups with 0 link: 35000
-	# of groups with 10000 - 99999 links: 1
-	Total # of groups: 35001
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
deleted file mode 100644
index a5ee7e8..0000000
--- a/tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ /dev/null
@@ -1,7 +0,0 @@
-Filename: h5stat_newgrat.h5
-Small # of attributes (objects with 1 to 10 attributes):
-	Total # of objects with small # of attributes: 0
-Attribute bins:
-	# of objects with 100 - 999 attributes: 1
-	Total # of objects with attributes: 1
-	Max. # of attributes to objects: 100
diff --git a/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
deleted file mode 100644
index 41195ac..0000000
--- a/tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
+++ /dev/null
@@ -1,5 +0,0 @@
-Filename: h5stat_newgrat.h5
-File space information for groups' metadata (in bytes):
-	Object headers (total/unused): 5145147/3220092
-	B-tree/List: 470054
-	Heap: 739045
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
deleted file mode 100644
index e305f58..0000000
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ /dev/null
@@ -1,95 +0,0 @@
-Filename: h5stat_newgrat.h5
-File information
-	# of unique groups: 35001
-	# of unique datasets: 1
-	# of unique named datatypes: 0
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 35001
-File space information for file metadata (in bytes):
-	Superblock: 48
-	Superblock extension: 119
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 5145147/3220092
-		Datasets(exclude compact data): 414/312
-		Datatypes: 0/0
-	Groups:
-		B-tree/List: 470054
-		Heap: 739045
-	Attributes:
-		B-tree/List: 2598
-		Heap: 4431
-	Chunked datasets:
-		Index: 0
-	Datasets:
-		Heap: 0
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 180
-		Amount of free space: 132
-Small groups (with 0 to 9 links):
-	# of groups with 0 link(s): 35000
-	Total # of small groups: 35000
-Group bins:
-	# of groups with 0 link: 35000
-	# of groups with 10000 - 99999 links: 1
-	Total # of groups: 35001
-Dataset dimension information:
-	Max. rank of datasets: 0
-	Dataset ranks:
-		# of dataset with rank 0: 1
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 1
-	Dataset layout counts[CHUNKED]: 0
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 1
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
-Dataset datatype information:
-	# of unique datatypes used by datasets: 1
-	Dataset datatype #0:
-		Count (total/named) = (1/0)
-		Size (desc./elmt) = (14/4)
-	Total dataset datatype count: 1
-Small # of attributes (objects with 1 to 10 attributes):
-	Total # of objects with small # of attributes: 0
-Attribute bins:
-	# of objects with 100 - 999 attributes: 1
-	Total # of objects with attributes: 1
-	Max. # of attributes to objects: 100
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	# of sections of size 1: 1
-	Total # of small size sections: 1
-Free-space section bins:
-	# of sections of size 1 - 9: 1
-	# of sections of size 10 - 99: 4
-	Total # of sections: 5
-File space management strategy: H5F_FILE_SPACE_ALL_PERSIST
-Summary of file space information:
-  File metadata: 6362036 bytes
-  Raw data: 0 bytes
-  Amount/Percent of tracked free space: 132 bytes/0.0%
-  Unaccounted space: 0 bytes
-Total space: 6362168 bytes
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.h5 b/tools/h5stat/testfiles/h5stat_newgrat.h5
deleted file mode 100644
index c919b71..0000000
--- a/tools/h5stat/testfiles/h5stat_newgrat.h5
+++ /dev/null
diff --git a/tools/h5stat/testfiles/h5stat_nofile.ddl b/tools/h5stat/testfiles/h5stat_nofile.ddl
deleted file mode 100644
index d8a8b2c..0000000
--- a/tools/h5stat/testfiles/h5stat_nofile.ddl
+++ /dev/null
@@ -1,25 +0,0 @@
-Usage: h5stat [OPTIONS] file
-
-      OPTIONS
-     -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
-     -f, --file            Print file information
-     -F, --filemetadata    Print file space information for file's metadata
-     -g, --group           Print group information
-     -l N, --links=N       Set the threshold for the # of links when printing
-                           information for small groups.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -G, --groupmetadata   Print file space information for groups' metadata
-     -d, --dset            Print dataset information
-     -m N, --dims=N        Set the threshold for the dimension sizes when printing
-                           information for small datasets.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -D, --dsetmetadata    Print file space information for datasets' metadata
-     -T, --dtypemetadata   Print datasets' datatype information
-     -A, --attribute       Print attribute information
-     -a N, --numattrs=N    Set the threshold for the # of attributes when printing
-                           information for small # of attributes.  N is an integer greater
-                           than 0.  The default threshold is 10.
-     -s, --freespace       Print free space information
-     -S, --summary         Print summary of file space information
-h5stat error: missing file name
diff --git a/tools/h5stat/testfiles/h5stat_notexist.ddl b/tools/h5stat/testfiles/h5stat_notexist.ddl
deleted file mode 100644
index cc25e43..0000000
--- a/tools/h5stat/testfiles/h5stat_notexist.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Filename: notexist.h5
-h5stat error: unable to open file "notexist.h5"
diff --git a/tools/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/h5stat/testfiles/h5stat_numattrs1.ddl
deleted file mode 100644
index fb5568d..0000000
--- a/tools/h5stat/testfiles/h5stat_numattrs1.ddl
+++ /dev/null
@@ -1,17 +0,0 @@
-Filename: h5stat_threshold.h5
-Small # of attributes (objects with 1 to 10 attributes):
-	# of objects with 1 attributes: 2
-	# of objects with 10 attributes: 1
-	Total # of objects with small # of attributes: 3
-Attribute bins:
-	# of objects with 1 - 9 attributes: 2
-	# of objects with 10 - 99 attributes: 3
-	Total # of objects with attributes: 5
-	Max. # of attributes to objects: 25
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 16128 bytes
-  Raw data: 0 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 184 bytes
-Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/h5stat/testfiles/h5stat_numattrs2.ddl
deleted file mode 100644
index ccb23c1..0000000
--- a/tools/h5stat/testfiles/h5stat_numattrs2.ddl
+++ /dev/null
@@ -1,105 +0,0 @@
-Filename: h5stat_threshold.h5
-File information
-	# of unique groups: 4
-	# of unique datasets: 23
-	# of unique named datatypes: 0
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 10
-File space information for file metadata (in bytes):
-	Superblock: 96
-	Superblock extension: 0
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 3576/0
-		Datasets(exclude compact data): 7896/2912
-		Datatypes: 0/0
-	Groups:
-		B-tree/List: 3816
-		Heap: 744
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 0
-	Datasets:
-		Heap: 0
-	Shared Messages:
-		Header: 0
-		B-tree/List: 0
-		Heap: 0
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
-Small groups (with 0 to 9 links):
-	# of groups with 0 link(s): 1
-	# of groups with 7 link(s): 1
-	# of groups with 9 link(s): 1
-	Total # of small groups: 3
-Group bins:
-	# of groups with 0 link: 1
-	# of groups with 1 - 9 links: 2
-	# of groups with 10 - 99 links: 1
-	Total # of groups: 4
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 0: 2
-		# of dataset with rank 1: 20
-		# of dataset with rank 2: 1
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 6
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		# of datasets with dimension sizes 0: 1
-		# of datasets with dimension sizes 6: 19
-		Total # of small datasets: 20
-	1-D Dataset dimension bins:
-		# of datasets with dimension size 0: 1
-		# of datasets with dimension size 1 - 9: 19
-		Total # of datasets: 20
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 23
-	Dataset layout counts[CHUNKED]: 0
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 23
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
-Dataset datatype information:
-	# of unique datatypes used by datasets: 1
-	Dataset datatype #0:
-		Count (total/named) = (23/0)
-		Size (desc./elmt) = (14/1)
-	Total dataset datatype count: 23
-Small # of attributes (objects with 1 to 1 attributes):
-	# of objects with 1 attributes: 2
-	Total # of objects with small # of attributes: 2
-Attribute bins:
-	# of objects with 1 - 9 attributes: 2
-	# of objects with 10 - 99 attributes: 3
-	Total # of objects with attributes: 5
-	Max. # of attributes to objects: 25
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	Total # of small size sections: 0
-Free-space section bins:
-	Total # of sections: 0
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 16128 bytes
-  Raw data: 0 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 184 bytes
-Total space: 16312 bytes
diff --git a/tools/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/h5stat/testfiles/h5stat_numattrs3.ddl
deleted file mode 100644
index de8d6a3..0000000
--- a/tools/h5stat/testfiles/h5stat_numattrs3.ddl
+++ /dev/null
@@ -1,12 +0,0 @@
-Filename: h5stat_threshold.h5
-Small # of attributes (objects with 1 to 25 attributes):
-	# of objects with 1 attributes: 2
-	# of objects with 10 attributes: 1
-	# of objects with 11 attributes: 1
-	# of objects with 25 attributes: 1
-	Total # of objects with small # of attributes: 5
-Attribute bins:
-	# of objects with 1 - 9 attributes: 2
-	# of objects with 10 - 99 attributes: 3
-	Total # of objects with attributes: 5
-	Max. # of attributes to objects: 25
diff --git a/tools/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/h5stat/testfiles/h5stat_numattrs4.ddl
deleted file mode 100644
index 2b0122a..0000000
--- a/tools/h5stat/testfiles/h5stat_numattrs4.ddl
+++ /dev/null
@@ -1,8 +0,0 @@
-Filename: h5stat_newgrat.h5
-Small # of attributes (objects with 1 to 100 attributes):
-	# of objects with 100 attributes: 1
-	Total # of objects with small # of attributes: 1
-Attribute bins:
-	# of objects with 100 - 999 attributes: 1
-	Total # of objects with attributes: 1
-	Max. # of attributes to objects: 100
diff --git a/tools/h5stat/testfiles/h5stat_threshold.h5 b/tools/h5stat/testfiles/h5stat_threshold.h5
deleted file mode 100644
index 9f7c8c8..0000000
--- a/tools/h5stat/testfiles/h5stat_threshold.h5
+++ /dev/null
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
deleted file mode 100644
index 4cf33fc..0000000
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ /dev/null
@@ -1,90 +0,0 @@
-Filename: h5stat_tsohm.h5
-File information
-	# of unique groups: 1
-	# of unique datasets: 3
-	# of unique named datatypes: 0
-	# of unique links: 0
-	# of unique other: 0
-	Max. # of links to object: 1
-	Max. # of objects in group: 3
-File space information for file metadata (in bytes):
-	Superblock: 48
-	Superblock extension: 40
-	User block: 0
-	Object headers: (total/unused)
-		Groups: 51/2
-		Datasets(exclude compact data): 852/447
-		Datatypes: 0/0
-	Groups:
-		B-tree/List: 872
-		Heap: 120
-	Attributes:
-		B-tree/List: 0
-		Heap: 0
-	Chunked datasets:
-		Index: 0
-	Datasets:
-		Heap: 0
-	Shared Messages:
-		Header: 38
-		B-tree/List: 550
-		Heap: 1279
-	Free-space managers:
-		Header: 0
-		Amount of free space: 0
-Small groups (with 0 to 9 links):
-	# of groups with 3 link(s): 1
-	Total # of small groups: 1
-Group bins:
-	# of groups with 1 - 9 links: 1
-	Total # of groups: 1
-Dataset dimension information:
-	Max. rank of datasets: 2
-	Dataset ranks:
-		# of dataset with rank 2: 3
-1-D Dataset information:
-	Max. dimension size of 1-D datasets: 0
-	Small 1-D datasets (with dimension sizes 0 to 9):
-		Total # of small datasets: 0
-Dataset storage information:
-	Total raw data size: 0
-	Total external raw data size: 0
-Dataset layout information:
-	Dataset layout counts[COMPACT]: 0
-	Dataset layout counts[CONTIG]: 0
-	Dataset layout counts[CHUNKED]: 3
-	Dataset layout counts[VIRTUAL]: 0
-	Number of external files : 0
-Dataset filters information:
-	Number of datasets with:
-		NO filter: 3
-		GZIP filter: 0
-		SHUFFLE filter: 0
-		FLETCHER32 filter: 0
-		SZIP filter: 0
-		NBIT filter: 0
-		SCALEOFFSET filter: 0
-		USER-DEFINED filter: 0
-Dataset datatype information:
-	# of unique datatypes used by datasets: 1
-	Dataset datatype #0:
-		Count (total/named) = (3/0)
-		Size (desc./elmt) = (14/8)
-	Total dataset datatype count: 3
-Small # of attributes (objects with 1 to 10 attributes):
-	Total # of objects with small # of attributes: 0
-Attribute bins:
-	Total # of objects with attributes: 0
-	Max. # of attributes to objects: 0
-Free-space section threshold: 1 bytes
-Small size free-space sections (< 10 bytes):
-	Total # of small size sections: 0
-Free-space section bins:
-	Total # of sections: 0
-File space management strategy: H5F_FILE_SPACE_ALL
-Summary of file space information:
-  File metadata: 3850 bytes
-  Raw data: 0 bytes
-  Amount/Percent of tracked free space: 0 bytes/0.0%
-  Unaccounted space: 0 bytes
-Total space: 3850 bytes
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.h5 b/tools/h5stat/testfiles/h5stat_tsohm.h5
deleted file mode 100644
index e6c89f6..0000000
--- a/tools/h5stat/testfiles/h5stat_tsohm.h5
+++ /dev/null
diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in
deleted file mode 100644
index cbb732c..0000000
--- a/tools/h5stat/testh5stat.sh.in
+++ /dev/null
@@ -1,318 +0,0 @@
-#! /bin/sh
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-#
-# Tests for the h5stat tool
-#
-# Modifcations:
-# 	Vailin Choi; July 2013
-# 	Add tests for -l, -m, -a options
-#
-
-srcdir=@srcdir@
-
-# Determine which filters are available
-USE_FILTER_SZIP="@USE_FILTER_SZIP@"
-USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
-
-TESTNAME=h5stat
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-STAT=h5stat               # The tool name
-STAT_BIN=`pwd`/$STAT    # The path of the tool binary
-
-RM='rm -rf'
-CMP='cmp -s'
-DIFF='diff -c'
-CP='cp'
-DIRNAME='dirname'
-LS='ls'
-AWK='awk'
-
-nerrors=0
-verbose=yes
-
-# source dirs
-SRC_TOOLS="$srcdir/.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
-
-# testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DIFF_TESTFILES="$SRC_TOOLS/h5diff/testfiles"
-SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles"
-SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"
-SRC_H5JAM_TESTFILES="$SRC_TOOLS/h5jam/testfiles"
-SRC_H5STAT_TESTFILES="$SRC_TOOLS/h5stat/testfiles"
-SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/h5import/testfiles"
-
-TESTDIR=./testfiles
-test -d $TESTDIR || mkdir $TESTDIR
-
-######################################################################
-# test files
-# --------------------------------------------------------------------
-# All the test files copy from source directory to test directory
-# NOTE: Keep this framework to add/remove test files.
-#       Any test files from other tools can be used in this framework.
-#       This list are also used for checking exist.
-#       Comment '#' without space can be used.
-# --------------------------------------------------------------------
-LIST_HDF5_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_filters.h5
-$SRC_H5STAT_TESTFILES/h5stat_tsohm.h5
-$SRC_H5STAT_TESTFILES/h5stat_newgrat.h5
-$SRC_H5STAT_TESTFILES/h5stat_idx.h5
-$SRC_H5STAT_TESTFILES/h5stat_threshold.h5
-"
-
-LIST_OTHER_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_help1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
-$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl
-$SRC_H5STAT_TESTFILES/h5stat_idx.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err1_links.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links4.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links5.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err1_dims.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl
-"
-
-#
-# copy test files and expected output files from source dirs to test dir
-#
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES"
-
-COPY_TESTFILES_TO_TESTDIR()
-{
-    # copy test files. Used -f to make sure get a new copy
-    for tstfile in $COPY_TESTFILES
-    do
-        # ignore '#' comment
-        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
-        RET=$?
-        if [ $RET -eq 1 ]; then
-            # skip cp if srcdir is same as destdir
-            # this occurs when build/test performed in source dir and
-            # make cp fail
-            SDIR=`$DIRNAME $tstfile`
-            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
-            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
-            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
-                if [ $? -ne 0 ]; then
-                    echo "Error: FAILED to copy $tstfile ."
-                
-                    # Comment out this to CREATE expected file
-                    exit $EXIT_FAILURE
-                fi
-            fi
-        fi
-    done
-}
-
-CLEAN_TESTFILES_AND_TESTDIR()
-{
-    # skip rm if srcdir is same as destdir
-    # this occurs when build/test performed in source dir and
-    # make cp fail
-    SDIR=$SRC_H5STAT_TESTFILES
-    INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
-    INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
-    if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-        $RM $TESTDIR
-    fi
-}
-
-# Print a line-line message left justified in a field of 70 characters
-# beginning with the word "Testing".
-#
-TESTING() {
-   SPACES="                                                               "
-   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
-}
-
-# Source in the output filter function definitions.
-. $srcdir/../../bin/output_filter.sh
-
-# Run a test and print PASS or *FAIL*.  If a test fails then increment
-# the `nerrors' global variable and (if $verbose is set) display the
-# difference between the actual output and the expected output. The
-# expected output is given as the first argument to this function and
-# the actual output file is calculated by replacing the `.ddl' with
-# `.out'.  The actual output is not removed if $HDF5_NOCLEANUP has a
-# non-zero value.
-#
-TOOLTEST() {
-   expect="$TESTDIR/$1"
-   actual="$TESTDIR/`basename $1 .ddl`.out"
-   actual_err="$TESTDIR/`basename $1 .ddl`.err"
-   actual_sav=${actual}-sav
-   actual_err_sav=${actual_err}-sav
-   shift
-
-   # Run test.
-   TESTING $STAT $@
-   (
-      cd $TESTDIR
-      $RUNSERIAL $STAT_BIN $@
-   ) >$actual 2>$actual_err
-
-   # save actual and actual_err in case they are needed later.
-   cp $actual $actual_sav
-   STDOUT_FILTER $actual
-   cp $actual_err $actual_err_sav
-   STDERR_FILTER $actual_err
-   cat $actual_err >> $actual
-
-   if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-    cp $actual $expect
-   elif $CMP $expect $actual; then
-      echo " PASSED"
-   else
-      echo "*FAILED*"
-      echo "    Expected result (*.ddl) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-   fi
-
-   # Clean up output file
-   if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_err $actual_sav $actual_err_sav
-   fi
-}
-
-
-# Print a "SKIP" message
-SKIP() {
-	 TESTING $STAT $@
-	  echo  " -SKIP-"
-}
-  
-
-
-##############################################################################
-##############################################################################
-###			  T H E   T E S T S                                ###
-##############################################################################
-##############################################################################
-# prepare for test
-COPY_TESTFILES_TO_TESTDIR
-
-# Test for help flag
-TOOLTEST h5stat_help1.ddl -h
-TOOLTEST h5stat_help2.ddl --help
-# Test when h5stat a file that does not exist
-TOOLTEST h5stat_notexist.ddl notexist.h5
-TOOLTEST h5stat_nofile.ddl ''
-
-# Test file with groups, compressed datasets, user-applied fileters, etc.
-# h5stat_filters.h5 is a copy of ../../testfiles/tfilters.h5 as of release 1.8.0-alpha4
-TOOLTEST h5stat_filters.ddl h5stat_filters.h5
-TOOLTEST h5stat_filters-file.ddl  -f   h5stat_filters.h5
-TOOLTEST h5stat_filters-F.ddl  -F   h5stat_filters.h5
-TOOLTEST h5stat_filters-d.ddl  -d   h5stat_filters.h5
-TOOLTEST h5stat_filters-g.ddl  -g   h5stat_filters.h5
-TOOLTEST h5stat_filters-dT.ddl -dT  h5stat_filters.h5
-TOOLTEST h5stat_filters-UD.ddl -D h5stat_filters.h5
-TOOLTEST h5stat_filters-UT.ddl -T h5stat_filters.h5
-#
-# h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c 
-# as of release 1.8.7-snap0 (on a 64-bit machine)
-TOOLTEST h5stat_tsohm.ddl h5stat_tsohm.h5
-# h5stat_newgrat.h5 is generated by h5stat_gentest.c
-TOOLTEST h5stat_newgrat.ddl h5stat_newgrat.h5
-TOOLTEST h5stat_newgrat-UG.ddl -G h5stat_newgrat.h5
-TOOLTEST h5stat_newgrat-UA.ddl -A h5stat_newgrat.h5
-# h5stat_idx.h5 is generated by h5stat_gentest.c
-TOOLTEST h5stat_idx.ddl h5stat_idx.h5
-#
-# Tests for -l (--links) option on h5stat_threshold.h5: 
-# 	-l 0 (incorrect threshold value)
-# 	-g -l 8
-# 	--links=8
-# 	--links=20 -g
-TOOLTEST h5stat_err1_links.ddl -l 0 h5stat_threshold.h5
-TOOLTEST h5stat_links1.ddl -g -l 8 h5stat_threshold.h5
-TOOLTEST h5stat_links2.ddl --links=8 h5stat_threshold.h5
-TOOLTEST h5stat_links3.ddl --links=20 -g h5stat_threshold.h5
-#
-# Tests for -l (--links) option on h5stat_newgrat.h5: 
-# 	-g
-# 	-g -l 40000
-TOOLTEST h5stat_links4.ddl -g h5stat_newgrat.h5
-TOOLTEST h5stat_links5.ddl -g -l 40000 h5stat_newgrat.h5
-#
-# Tests for -m (--dims) option on h5stat_threshold.h5
-# 	-d --dims=-1 (incorrect threshold value)
-# 	-gd -m 5
-# 	-d --di=15
-TOOLTEST h5stat_err1_dims.ddl -d --dims=-1 h5stat_threshold.h5
-TOOLTEST h5stat_dims1.ddl -gd -m 5 h5stat_threshold.h5
-TOOLTEST h5stat_dims2.ddl -d --di=15 h5stat_threshold.h5
-#
-# Tests for -a option on h5stat_threshold.h5
-# 	-a -2 (incorrect threshold value)
-#	--numattrs (without threshold value)
-#	-AS -a 10
-#	-a 1
-#	-A --numattrs=25
-TOOLTEST h5stat_err1_numattrs.ddl -a -2 h5stat_threshold.h5
-TOOLTEST h5stat_err2_numattrs.ddl --numattrs h5stat_threshold.h5
-TOOLTEST h5stat_numattrs1.ddl -AS -a 10 h5stat_threshold.h5
-TOOLTEST h5stat_numattrs2.ddl -a 1 h5stat_threshold.h5
-TOOLTEST h5stat_numattrs3.ddl -A --numattrs=25 h5stat_threshold.h5
-#
-# Tests for -a option on h5stat_newgrat.h5
-#	-A -a 100
-TOOLTEST h5stat_numattrs4.ddl -A -a 100 h5stat_newgrat.h5
-#
-
-# Clean up temporary files/directories
-CLEAN_TESTFILES_AND_TESTDIR
-
-if test $nerrors -eq 0 ; then
-    echo "All $TESTNAME tests passed."
-    exit $EXIT_SUCCESS
-else
-    echo "$TESTNAME tests failed with $nerrors errors."
-    exit $EXIT_FAILURE
-fi
-