Split tools into src and test - update with new files or locations

1 files changed, 607 insertions, 572 deletions

diff --git a/MANIFEST b/MANIFEST
index 709da80..49c133d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1169,28 +1169,32 @@
 
 ./tools/COPYING
 ./tools/Makefile.am
-
-./tools/h5dump/Makefile.am
-./tools/h5dump/h5dump.c
-./tools/h5dump/h5dump.h
-./tools/h5dump/h5dump_defines.h
-./tools/h5dump/h5dump_extern.h
-./tools/h5dump/h5dump_ddl.c
-./tools/h5dump/h5dump_ddl.h
-./tools/h5dump/h5dump_xml.c
-./tools/h5dump/h5dump_xml.h
-./tools/h5dump/h5dumpgentest.c
-./tools/h5dump/testh5dump.sh.in
-./tools/h5dump/testh5dumppbits.sh.in
-./tools/h5dump/testh5dumpxml.sh.in
-./tools/h5dump/testh5dumpvds.sh.in
-./tools/h5dump/binread.c
-
-./tools/h5import/Makefile.am
-./tools/h5import/h5import.h
-./tools/h5import/h5import.c
-./tools/h5import/h5importtest.c
-./tools/h5import/h5importtestutil.sh.in
+./tools/src/Makefile.am
+./tools/test/Makefile.am
+
+./tools/src/h5dump/Makefile.am
+./tools/src/h5dump/h5dump.c
+./tools/src/h5dump/h5dump.h
+./tools/src/h5dump/h5dump_defines.h
+./tools/src/h5dump/h5dump_extern.h
+./tools/src/h5dump/h5dump_ddl.c
+./tools/src/h5dump/h5dump_ddl.h
+./tools/src/h5dump/h5dump_xml.c
+./tools/src/h5dump/h5dump_xml.h
+./tools/test/h5dump/Makefile.am
+./tools/test/h5dump/h5dumpgentest.c
+./tools/test/h5dump/testh5dump.sh.in
+./tools/test/h5dump/testh5dumppbits.sh.in
+./tools/test/h5dump/testh5dumpxml.sh.in
+./tools/test/h5dump/testh5dumpvds.sh.in
+./tools/test/h5dump/binread.c
+
+./tools/src/h5import/Makefile.am
+./tools/src/h5import/h5import.h
+./tools/src/h5import/h5import.c
+./tools/test/h5import/Makefile.am
+./tools/test/h5import/h5importtest.c
+./tools/test/h5import/h5importtestutil.sh.in
 
 # testfiles for h5import
 ./tools/h5import/testfiles/binfp64.conf
@@ -1244,98 +1248,102 @@
 ./tools/h5import/testfiles/dtxtstr.h5.txt
 
 # h5diff sources
-./tools/h5diff/Makefile.am
-./tools/h5diff/h5diff_common.c
-./tools/h5diff/h5diff_common.h
-./tools/h5diff/h5diff_main.c
-./tools/h5diff/ph5diff_main.c
-./tools/h5diff/h5diffgentest.c
-./tools/h5diff/testh5diff.sh.in
-./tools/h5diff/testph5diff.sh.in
+./tools/src/h5diff/Makefile.am
+./tools/src/h5diff/h5diff_common.c
+./tools/src/h5diff/h5diff_common.h
+./tools/src/h5diff/h5diff_main.c
+./tools/src/h5diff/ph5diff_main.c
+./tools/test/h5diff/Makefile.am
+./tools/test/h5diff/h5diffgentest.c
+./tools/test/h5diff/testh5diff.sh.in
+./tools/test/h5diff/testph5diff.sh.in
 
 # h5format_convert sources
-./tools/h5format_convert/Makefile.am
-./tools/h5format_convert/h5fc_chk_idx.c
-./tools/h5format_convert/h5fc_gentest.c
-./tools/h5format_convert/h5format_convert.c
-./tools/h5format_convert/testfiles/h5fc_v_n_all.ddl
-./tools/h5format_convert/testfiles/h5fc_v_bt1.ddl
-./tools/h5format_convert/testfiles/h5fc_v_err.ddl
-./tools/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
-./tools/h5format_convert/testfiles/h5fc_d_file.ddl
-./tools/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
-./tools/h5format_convert/testfiles/h5fc_dname.ddl
-./tools/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl
-./tools/h5format_convert/testfiles/h5fc_help.ddl
-./tools/h5format_convert/testfiles/h5fc_v_all.ddl
-./tools/h5format_convert/testfiles/h5fc_nooption.ddl
-./tools/h5format_convert/testfiles/h5fc_v_n_1d.ddl
-./tools/h5format_convert/testfiles/h5fc_nonexistfile.ddl
-./tools/h5format_convert/testfiles/h5fc_non_v3.h5
-./tools/h5format_convert/testfiles/h5fc_edge_v3.h5
-./tools/h5format_convert/testfiles/h5fc_err_level.h5
-./tools/h5format_convert/testfiles/h5fc_ext1_f.h5
-./tools/h5format_convert/testfiles/h5fc_ext1_i.h5
-./tools/h5format_convert/testfiles/h5fc_ext1_s.h5
-./tools/h5format_convert/testfiles/h5fc_ext2_if.h5
-./tools/h5format_convert/testfiles/h5fc_ext2_is.h5
-./tools/h5format_convert/testfiles/h5fc_ext2_sf.h5
-./tools/h5format_convert/testfiles/h5fc_ext3_isf.h5
-./tools/h5format_convert/testfiles/h5fc_ext_none.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext1_f.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext1_i.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext1_s.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext2_if.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext2_is.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext2_sf.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext3_isf.h5
-./tools/h5format_convert/testfiles/old_h5fc_ext_none.h5
-./tools/h5format_convert/testfiles/h5fc_ext1_f.ddl
-./tools/h5format_convert/testfiles/h5fc_ext1_i.ddl
-./tools/h5format_convert/testfiles/h5fc_ext1_s.ddl
-./tools/h5format_convert/testfiles/h5fc_ext2_if.ddl
-./tools/h5format_convert/testfiles/h5fc_ext2_is.ddl
-./tools/h5format_convert/testfiles/h5fc_ext2_sf.ddl
-./tools/h5format_convert/testfiles/h5fc_ext3_isf.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
-./tools/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
-./tools/h5format_convert/testh5fc.sh.in
+./tools/src/h5format_convert/Makefile.am
+./tools/src/h5format_convert/h5fc_chk_idx.c
+./tools/src/h5format_convert/h5fc_gentest.c
+./tools/src/h5format_convert/h5format_convert.c
+./tools/src/h5format_convert/testfiles/h5fc_v_n_all.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_bt1.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_err.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+./tools/src/h5format_convert/testfiles/h5fc_d_file.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+./tools/src/h5format_convert/testfiles/h5fc_dname.ddl
+./tools/src/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl
+./tools/src/h5format_convert/testfiles/h5fc_help.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_all.ddl
+./tools/src/h5format_convert/testfiles/h5fc_nooption.ddl
+./tools/src/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+./tools/src/h5format_convert/testfiles/h5fc_nonexistfile.ddl
+./tools/src/h5format_convert/testfiles/h5fc_non_v3.h5
+./tools/src/h5format_convert/testfiles/h5fc_edge_v3.h5
+./tools/src/h5format_convert/testfiles/h5fc_err_level.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext1_f.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext1_i.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext1_s.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext2_if.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext2_is.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext2_sf.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext3_isf.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext_none.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_f.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_i.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_s.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_if.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_is.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_sf.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext3_isf.h5
+./tools/src/h5format_convert/testfiles/old_h5fc_ext_none.h5
+./tools/src/h5format_convert/testfiles/h5fc_ext1_f.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext1_i.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext1_s.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext2_if.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext2_is.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+./tools/src/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+./tools/src/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+./tools/src/h5format_convert/testh5fc.sh.in
 
 # h5repack sources
-./tools/h5repack/Makefile.am
-./tools/h5repack/dynlib_rpk.c
-./tools/h5repack/dynlib_vrpk.c
-./tools/h5repack/h5repack.sh.in
-./tools/h5repack/h5repack_plugin.sh.in
-./tools/h5repack/h5repack.c
-./tools/h5repack/h5repack.h
-./tools/h5repack/h5repack_copy.c
-./tools/h5repack/h5repack_refs.c
-./tools/h5repack/h5repack_filters.c
-./tools/h5repack/h5repack_main.c
-./tools/h5repack/h5repack_opttable.c
-./tools/h5repack/h5repack_parse.c
-./tools/h5repack/h5repack_verify.c
-./tools/h5repack/h5repacktst.c
-./tools/h5repack/testh5repack_detect_szip.c
+./tools/src/h5repack/Makefile.am
+./tools/src/h5repack/h5repack.c
+./tools/src/h5repack/h5repack.h
+./tools/src/h5repack/h5repack_copy.c
+./tools/src/h5repack/h5repack_refs.c
+./tools/src/h5repack/h5repack_filters.c
+./tools/src/h5repack/h5repack_main.c
+./tools/src/h5repack/h5repack_opttable.c
+./tools/src/h5repack/h5repack_parse.c
+./tools/src/h5repack/h5repack_verify.c
+./tools/test/h5repack/Makefile.am
+./tools/test/h5repack/dynlib_rpk.c
+./tools/test/h5repack/dynlib_vrpk.c
+./tools/test/h5repack/h5repack.sh.in
+./tools/test/h5repack/h5repack_plugin.sh.in
+./tools/test/h5repack/h5repacktst.c
+./tools/test/h5repack/testh5repack_detect_szip.c
 
 # h5ls sources
-./tools/h5ls/CMakeTestsVDS.cmake
-./tools/h5ls/Makefile.am
-./tools/h5ls/h5ls.c
-./tools/h5ls/testh5ls.sh.in
-./tools/h5ls/testh5lsvds.sh.in
+./tools/src/h5ls/Makefile.am
+./tools/src/h5ls/h5ls.c
+./tools/test/h5ls/Makefile.am
+./tools/test/h5ls/CMakeTestsVDS.cmake
+./tools/test/h5ls/testh5ls.sh.in
+./tools/test/h5ls/testh5lsvds.sh.in
 
 # h5copy sources
-./tools/h5copy/testh5copy.sh.in
-./tools/h5copy/h5copy.c
-./tools/h5copy/h5copygentest.c
-./tools/h5copy/Makefile.am
+./tools/src/h5copy/Makefile.am
+./tools/src/h5copy/h5copy.c
+./tools/test/h5copy/Makefile.am
+./tools/test/h5copy/h5copygentest.c
+./tools/test/h5copy/testh5copy.sh.in
 
 
 ./tools/lib/Makefile.am
@@ -1364,77 +1372,79 @@
 ./tools/lib/io_timer.c
 ./tools/lib/io_timer.h
 
-./tools/misc/Makefile.am
-./tools/misc/h5cc.in
-./tools/misc/h5debug.c
-./tools/misc/h5mkgrp.c
-./tools/misc/h5redeploy.in
-./tools/misc/h5repart.c
-./tools/misc/h5repart_gentest.c
-./tools/misc/repart_test.c
-./tools/misc/testh5mkgrp.sh.in
-./tools/misc/testh5repart.sh.in
-./tools/misc/talign.c
-./tools/misc/testfiles/h5mkgrp_help.txt
-./tools/misc/testfiles/h5mkgrp_version.txt.in
-./tools/misc/h5perf_gentest.c
-./tools/misc/vds/Makefile.am
-./tools/misc/vds/UC_1.h
-./tools/misc/vds/UC_1_one_dim_gen.c
-./tools/misc/vds/UC_2.h
-./tools/misc/vds/UC_2_two_dims_gen.c
-./tools/misc/vds/UC_3.h
-./tools/misc/vds/UC_3_gaps_gen.c
-./tools/misc/vds/UC_4.h
-./tools/misc/vds/UC_4_printf_gen.c
-./tools/misc/vds/UC_5.h
-./tools/misc/vds/UC_5_stride_gen.c
-./tools/misc/vds/UC_common.h
+./tools/src/misc/Makefile.am
+./tools/src/misc/h5cc.in
+./tools/src/misc/h5debug.c
+./tools/src/misc/h5mkgrp.c
+./tools/src/misc/h5redeploy.in
+./tools/src/misc/h5repart.c
+./tools/test/misc/Makefile.am
+./tools/test/misc/h5repart_gentest.c
+./tools/test/misc/repart_test.c
+./tools/test/misc/testh5mkgrp.sh.in
+./tools/test/misc/testh5repart.sh.in
+./tools/test/misc/talign.c
+./tools/test/misc/testfiles/h5mkgrp_help.txt
+./tools/test/misc/testfiles/h5mkgrp_version.txt.in
+./tools/test/misc/h5perf_gentest.c
+./tools/test/misc/vds/Makefile.am
+./tools/test/misc/vds/UC_1.h
+./tools/test/misc/vds/UC_1_one_dim_gen.c
+./tools/test/misc/vds/UC_2.h
+./tools/test/misc/vds/UC_2_two_dims_gen.c
+./tools/test/misc/vds/UC_3.h
+./tools/test/misc/vds/UC_3_gaps_gen.c
+./tools/test/misc/vds/UC_4.h
+./tools/test/misc/vds/UC_4_printf_gen.c
+./tools/test/misc/vds/UC_5.h
+./tools/test/misc/vds/UC_5_stride_gen.c
+./tools/test/misc/vds/UC_common.h
 
 # h5stat sources
-./tools/h5stat/Makefile.am
-./tools/h5stat/h5stat.c
+./tools/src/h5stat/Makefile.am
+./tools/src/h5stat/h5stat.c
 
 # h5stat test files
-./tools/h5stat/h5stat_gentest.c
-./tools/h5stat/testh5stat.sh.in
-./tools/h5stat/testfiles/h5stat_dims1.ddl
-./tools/h5stat/testfiles/h5stat_dims2.ddl
-./tools/h5stat/testfiles/h5stat_err1_dims.ddl
-./tools/h5stat/testfiles/h5stat_err1_links.ddl
-./tools/h5stat/testfiles/h5stat_err1_numattrs.ddl
-./tools/h5stat/testfiles/h5stat_err2_numattrs.ddl
-./tools/h5stat/testfiles/h5stat_filters.ddl
-./tools/h5stat/testfiles/h5stat_filters-d.ddl
-./tools/h5stat/testfiles/h5stat_filters-dT.ddl
-./tools/h5stat/testfiles/h5stat_filters-F.ddl
-./tools/h5stat/testfiles/h5stat_filters-file.ddl
-./tools/h5stat/testfiles/h5stat_filters-g.ddl
-./tools/h5stat/testfiles/h5stat_filters-UD.ddl
-./tools/h5stat/testfiles/h5stat_filters-UT.ddl
-./tools/h5stat/testfiles/h5stat_filters.h5
-./tools/h5stat/testfiles/h5stat_help1.ddl
-./tools/h5stat/testfiles/h5stat_help2.ddl
-./tools/h5stat/testfiles/h5stat_idx.h5
-./tools/h5stat/testfiles/h5stat_idx.ddl
-./tools/h5stat/testfiles/h5stat_links1.ddl
-./tools/h5stat/testfiles/h5stat_links2.ddl
-./tools/h5stat/testfiles/h5stat_links3.ddl
-./tools/h5stat/testfiles/h5stat_links4.ddl
-./tools/h5stat/testfiles/h5stat_links5.ddl
-./tools/h5stat/testfiles/h5stat_newgrat.ddl
-./tools/h5stat/testfiles/h5stat_newgrat-UA.ddl
-./tools/h5stat/testfiles/h5stat_newgrat-UG.ddl
-./tools/h5stat/testfiles/h5stat_newgrat.h5
-./tools/h5stat/testfiles/h5stat_nofile.ddl
-./tools/h5stat/testfiles/h5stat_notexist.ddl
-./tools/h5stat/testfiles/h5stat_numattrs1.ddl
-./tools/h5stat/testfiles/h5stat_numattrs2.ddl
-./tools/h5stat/testfiles/h5stat_numattrs3.ddl
-./tools/h5stat/testfiles/h5stat_numattrs4.ddl
-./tools/h5stat/testfiles/h5stat_threshold.h5
-./tools/h5stat/testfiles/h5stat_tsohm.ddl
-./tools/h5stat/testfiles/h5stat_tsohm.h5
+./tools/test/h5stat/Makefile.am
+./tools/test/h5stat/h5stat_gentest.c
+./tools/test/h5stat/testh5stat.sh.in
+./tools/test/h5stat/testfiles/h5stat_dims1.ddl
+./tools/test/h5stat/testfiles/h5stat_dims2.ddl
+./tools/test/h5stat/testfiles/h5stat_err1_dims.ddl
+./tools/test/h5stat/testfiles/h5stat_err1_links.ddl
+./tools/test/h5stat/testfiles/h5stat_err1_numattrs.ddl
+./tools/test/h5stat/testfiles/h5stat_err2_numattrs.ddl
+./tools/test/h5stat/testfiles/h5stat_filters.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-d.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-dT.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-F.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-file.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-g.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-UD.ddl
+./tools/test/h5stat/testfiles/h5stat_filters-UT.ddl
+./tools/test/h5stat/testfiles/h5stat_filters.h5
+./tools/test/h5stat/testfiles/h5stat_help1.ddl
+./tools/test/h5stat/testfiles/h5stat_help2.ddl
+./tools/test/h5stat/testfiles/h5stat_idx.h5
+./tools/test/h5stat/testfiles/h5stat_idx.ddl
+./tools/test/h5stat/testfiles/h5stat_links1.ddl
+./tools/test/h5stat/testfiles/h5stat_links2.ddl
+./tools/test/h5stat/testfiles/h5stat_links3.ddl
+./tools/test/h5stat/testfiles/h5stat_links4.ddl
+./tools/test/h5stat/testfiles/h5stat_links5.ddl
+./tools/test/h5stat/testfiles/h5stat_newgrat.ddl
+./tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl
+./tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl
+./tools/test/h5stat/testfiles/h5stat_newgrat.h5
+./tools/test/h5stat/testfiles/h5stat_nofile.ddl
+./tools/test/h5stat/testfiles/h5stat_notexist.ddl
+./tools/test/h5stat/testfiles/h5stat_numattrs1.ddl
+./tools/test/h5stat/testfiles/h5stat_numattrs2.ddl
+./tools/test/h5stat/testfiles/h5stat_numattrs3.ddl
+./tools/test/h5stat/testfiles/h5stat_numattrs4.ddl
+./tools/test/h5stat/testfiles/h5stat_threshold.h5
+./tools/test/h5stat/testfiles/h5stat_tsohm.ddl
+./tools/test/h5stat/testfiles/h5stat_tsohm.h5
 
 # h5dump test files
 ./tools/testfiles/charsets.h5
@@ -1731,44 +1741,44 @@
 ./tools/testfiles/twithddlfile.exp
 
 # h5dump test error files
-./tools/h5dump/errfiles/filter_fail.err
-./tools/h5dump/errfiles/non_existing.err
-./tools/h5dump/errfiles/tall-1.err
-./tools/h5dump/errfiles/tall-2A.err
-./tools/h5dump/errfiles/tall-2A0.err
-./tools/h5dump/errfiles/tall-2B.err
-./tools/h5dump/errfiles/tarray1_big.err
-./tools/h5dump/errfiles/tattr-3.err
-./tools/h5dump/errfiles/tattrregR.err
-./tools/h5dump/errfiles/tcomp-3.err
-./tools/h5dump/errfiles/tdataregR.err
-./tools/h5dump/errfiles/tdset-2.err
-./tools/h5dump/errfiles/texceedsubblock.err
-./tools/h5dump/errfiles/texceedsubcount.err
-./tools/h5dump/errfiles/texceedsubstart.err
-./tools/h5dump/errfiles/texceedsubstride.err
-./tools/h5dump/errfiles/textlink.err
-./tools/h5dump/errfiles/textlinkfar.err
-./tools/h5dump/errfiles/textlinksrc.err
-./tools/h5dump/errfiles/tgroup-2.err
-./tools/h5dump/errfiles/tnofilename-with-packed-bits.err
-./tools/h5dump/errfiles/torderlinks1.err
-./tools/h5dump/errfiles/torderlinks2.err
-./tools/h5dump/errfiles/tpbitsCharLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsCharOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsIncomplete.err
-./tools/h5dump/errfiles/tpbitsIntLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsIntOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsLengthPositive.err
-./tools/h5dump/errfiles/tpbitsLongLengthExceeded.err
-./tools/h5dump/errfiles/tpbitsLongOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsMaxExceeded.err
-./tools/h5dump/errfiles/tpbitsOffsetExceeded.err
-./tools/h5dump/errfiles/tpbitsOffsetNegative.err
-./tools/h5dump/errfiles/tperror.err
-./tools/h5dump/errfiles/tqmarkfile.err
-./tools/h5dump/errfiles/tslink-D.err
+./tools/test/h5dump/errfiles/filter_fail.err
+./tools/test/h5dump/errfiles/non_existing.err
+./tools/test/h5dump/errfiles/tall-1.err
+./tools/test/h5dump/errfiles/tall-2A.err
+./tools/test/h5dump/errfiles/tall-2A0.err
+./tools/test/h5dump/errfiles/tall-2B.err
+./tools/test/h5dump/errfiles/tarray1_big.err
+./tools/test/h5dump/errfiles/tattr-3.err
+./tools/test/h5dump/errfiles/tattrregR.err
+./tools/test/h5dump/errfiles/tcomp-3.err
+./tools/test/h5dump/errfiles/tdataregR.err
+./tools/test/h5dump/errfiles/tdset-2.err
+./tools/test/h5dump/errfiles/texceedsubblock.err
+./tools/test/h5dump/errfiles/texceedsubcount.err
+./tools/test/h5dump/errfiles/texceedsubstart.err
+./tools/test/h5dump/errfiles/texceedsubstride.err
+./tools/test/h5dump/errfiles/textlink.err
+./tools/test/h5dump/errfiles/textlinkfar.err
+./tools/test/h5dump/errfiles/textlinksrc.err
+./tools/test/h5dump/errfiles/tgroup-2.err
+./tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err
+./tools/test/h5dump/errfiles/torderlinks1.err
+./tools/test/h5dump/errfiles/torderlinks2.err
+./tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err
+./tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err
+./tools/test/h5dump/errfiles/tpbitsIncomplete.err
+./tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err
+./tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err
+./tools/test/h5dump/errfiles/tpbitsLengthExceeded.err
+./tools/test/h5dump/errfiles/tpbitsLengthPositive.err
+./tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err
+./tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err
+./tools/test/h5dump/errfiles/tpbitsMaxExceeded.err
+./tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err
+./tools/test/h5dump/errfiles/tpbitsOffsetNegative.err
+./tools/test/h5dump/errfiles/tperror.err
+./tools/test/h5dump/errfiles/tqmarkfile.err
+./tools/test/h5dump/errfiles/tslink-D.err
 
 # h5dump packed bits validation
 ./tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -2039,285 +2049,285 @@
 
 
 #test files for h5diff
-./tools/h5diff/testfiles/h5diff_10.txt
-./tools/h5diff/testfiles/h5diff_11.txt
-./tools/h5diff/testfiles/h5diff_12.txt
-./tools/h5diff/testfiles/h5diff_13.txt
-./tools/h5diff/testfiles/h5diff_14.txt
-./tools/h5diff/testfiles/h5diff_15.txt
-./tools/h5diff/testfiles/h5diff_16_1.txt
-./tools/h5diff/testfiles/h5diff_16_2.txt
-./tools/h5diff/testfiles/h5diff_16_3.txt
-./tools/h5diff/testfiles/h5diff_17.txt
-./tools/h5diff/testfiles/h5diff_171.txt
-./tools/h5diff/testfiles/h5diff_172.txt
-./tools/h5diff/testfiles/h5diff_18.txt
-./tools/h5diff/testfiles/h5diff_18_1.txt
-./tools/h5diff/testfiles/h5diff_19.txt
-./tools/h5diff/testfiles/h5diff_20.txt
-./tools/h5diff/testfiles/h5diff_21.txt
-./tools/h5diff/testfiles/h5diff_22.txt
-./tools/h5diff/testfiles/h5diff_23.txt
-./tools/h5diff/testfiles/h5diff_24.txt
-./tools/h5diff/testfiles/h5diff_25.txt
-./tools/h5diff/testfiles/h5diff_26.txt
-./tools/h5diff/testfiles/h5diff_27.txt
-./tools/h5diff/testfiles/h5diff_28.txt
-./tools/h5diff/testfiles/h5diff_30.txt
-./tools/h5diff/testfiles/h5diff_50.txt
-./tools/h5diff/testfiles/h5diff_51.txt
-./tools/h5diff/testfiles/h5diff_52.txt
-./tools/h5diff/testfiles/h5diff_53.txt
-./tools/h5diff/testfiles/h5diff_54.txt
-./tools/h5diff/testfiles/h5diff_55.txt
-./tools/h5diff/testfiles/h5diff_56.txt
-./tools/h5diff/testfiles/h5diff_57.txt
-./tools/h5diff/testfiles/h5diff_58.txt
-./tools/h5diff/testfiles/h5diff_59.txt
-./tools/h5diff/testfiles/h5diff_600.txt
-./tools/h5diff/testfiles/h5diff_601.txt
-./tools/h5diff/testfiles/h5diff_603.txt
-./tools/h5diff/testfiles/h5diff_604.txt
-./tools/h5diff/testfiles/h5diff_605.txt
-./tools/h5diff/testfiles/h5diff_606.txt
-./tools/h5diff/testfiles/h5diff_607.txt
-./tools/h5diff/testfiles/h5diff_608.txt
-./tools/h5diff/testfiles/h5diff_609.txt
-./tools/h5diff/testfiles/h5diff_610.txt
-./tools/h5diff/testfiles/h5diff_612.txt
-./tools/h5diff/testfiles/h5diff_613.txt
-./tools/h5diff/testfiles/h5diff_614.txt
-./tools/h5diff/testfiles/h5diff_615.txt
-./tools/h5diff/testfiles/h5diff_616.txt
-./tools/h5diff/testfiles/h5diff_617.txt
-./tools/h5diff/testfiles/h5diff_618.txt
-./tools/h5diff/testfiles/h5diff_619.txt
-./tools/h5diff/testfiles/h5diff_621.txt
-./tools/h5diff/testfiles/h5diff_622.txt
-./tools/h5diff/testfiles/h5diff_623.txt
-./tools/h5diff/testfiles/h5diff_624.txt
-./tools/h5diff/testfiles/h5diff_625.txt
-./tools/h5diff/testfiles/h5diff_626.txt
-./tools/h5diff/testfiles/h5diff_627.txt
-./tools/h5diff/testfiles/h5diff_628.txt
-./tools/h5diff/testfiles/h5diff_629.txt
-./tools/h5diff/testfiles/h5diff_630.txt
-./tools/h5diff/testfiles/h5diff_631.txt
-./tools/h5diff/testfiles/h5diff_640.txt
-./tools/h5diff/testfiles/h5diff_641.txt
-./tools/h5diff/testfiles/h5diff_642.txt
-./tools/h5diff/testfiles/h5diff_643.txt
-./tools/h5diff/testfiles/h5diff_644.txt
-./tools/h5diff/testfiles/h5diff_645.txt
-./tools/h5diff/testfiles/h5diff_646.txt
-./tools/h5diff/testfiles/h5diff_70.txt
-./tools/h5diff/testfiles/h5diff_700.txt
-./tools/h5diff/testfiles/h5diff_701.txt
-./tools/h5diff/testfiles/h5diff_702.txt
-./tools/h5diff/testfiles/h5diff_703.txt
-./tools/h5diff/testfiles/h5diff_704.txt
-./tools/h5diff/testfiles/h5diff_705.txt
-./tools/h5diff/testfiles/h5diff_706.txt
-./tools/h5diff/testfiles/h5diff_707.txt
-./tools/h5diff/testfiles/h5diff_708.txt
-./tools/h5diff/testfiles/h5diff_709.txt
-./tools/h5diff/testfiles/h5diff_710.txt
-./tools/h5diff/testfiles/h5diff_80.txt
-./tools/h5diff/testfiles/h5diff_90.txt
-./tools/h5diff/testfiles/h5diff_100.txt
-./tools/h5diff/testfiles/h5diff_101.txt
-./tools/h5diff/testfiles/h5diff_102.txt
-./tools/h5diff/testfiles/h5diff_103.txt
-./tools/h5diff/testfiles/h5diff_104.txt
+./tools/test/h5diff/testfiles/h5diff_10.txt
+./tools/test/h5diff/testfiles/h5diff_11.txt
+./tools/test/h5diff/testfiles/h5diff_12.txt
+./tools/test/h5diff/testfiles/h5diff_13.txt
+./tools/test/h5diff/testfiles/h5diff_14.txt
+./tools/test/h5diff/testfiles/h5diff_15.txt
+./tools/test/h5diff/testfiles/h5diff_16_1.txt
+./tools/test/h5diff/testfiles/h5diff_16_2.txt
+./tools/test/h5diff/testfiles/h5diff_16_3.txt
+./tools/test/h5diff/testfiles/h5diff_17.txt
+./tools/test/h5diff/testfiles/h5diff_171.txt
+./tools/test/h5diff/testfiles/h5diff_172.txt
+./tools/test/h5diff/testfiles/h5diff_18.txt
+./tools/test/h5diff/testfiles/h5diff_18_1.txt
+./tools/test/h5diff/testfiles/h5diff_19.txt
+./tools/test/h5diff/testfiles/h5diff_20.txt
+./tools/test/h5diff/testfiles/h5diff_21.txt
+./tools/test/h5diff/testfiles/h5diff_22.txt
+./tools/test/h5diff/testfiles/h5diff_23.txt
+./tools/test/h5diff/testfiles/h5diff_24.txt
+./tools/test/h5diff/testfiles/h5diff_25.txt
+./tools/test/h5diff/testfiles/h5diff_26.txt
+./tools/test/h5diff/testfiles/h5diff_27.txt
+./tools/test/h5diff/testfiles/h5diff_28.txt
+./tools/test/h5diff/testfiles/h5diff_30.txt
+./tools/test/h5diff/testfiles/h5diff_50.txt
+./tools/test/h5diff/testfiles/h5diff_51.txt
+./tools/test/h5diff/testfiles/h5diff_52.txt
+./tools/test/h5diff/testfiles/h5diff_53.txt
+./tools/test/h5diff/testfiles/h5diff_54.txt
+./tools/test/h5diff/testfiles/h5diff_55.txt
+./tools/test/h5diff/testfiles/h5diff_56.txt
+./tools/test/h5diff/testfiles/h5diff_57.txt
+./tools/test/h5diff/testfiles/h5diff_58.txt
+./tools/test/h5diff/testfiles/h5diff_59.txt
+./tools/test/h5diff/testfiles/h5diff_600.txt
+./tools/test/h5diff/testfiles/h5diff_601.txt
+./tools/test/h5diff/testfiles/h5diff_603.txt
+./tools/test/h5diff/testfiles/h5diff_604.txt
+./tools/test/h5diff/testfiles/h5diff_605.txt
+./tools/test/h5diff/testfiles/h5diff_606.txt
+./tools/test/h5diff/testfiles/h5diff_607.txt
+./tools/test/h5diff/testfiles/h5diff_608.txt
+./tools/test/h5diff/testfiles/h5diff_609.txt
+./tools/test/h5diff/testfiles/h5diff_610.txt
+./tools/test/h5diff/testfiles/h5diff_612.txt
+./tools/test/h5diff/testfiles/h5diff_613.txt
+./tools/test/h5diff/testfiles/h5diff_614.txt
+./tools/test/h5diff/testfiles/h5diff_615.txt
+./tools/test/h5diff/testfiles/h5diff_616.txt
+./tools/test/h5diff/testfiles/h5diff_617.txt
+./tools/test/h5diff/testfiles/h5diff_618.txt
+./tools/test/h5diff/testfiles/h5diff_619.txt
+./tools/test/h5diff/testfiles/h5diff_621.txt
+./tools/test/h5diff/testfiles/h5diff_622.txt
+./tools/test/h5diff/testfiles/h5diff_623.txt
+./tools/test/h5diff/testfiles/h5diff_624.txt
+./tools/test/h5diff/testfiles/h5diff_625.txt
+./tools/test/h5diff/testfiles/h5diff_626.txt
+./tools/test/h5diff/testfiles/h5diff_627.txt
+./tools/test/h5diff/testfiles/h5diff_628.txt
+./tools/test/h5diff/testfiles/h5diff_629.txt
+./tools/test/h5diff/testfiles/h5diff_630.txt
+./tools/test/h5diff/testfiles/h5diff_631.txt
+./tools/test/h5diff/testfiles/h5diff_640.txt
+./tools/test/h5diff/testfiles/h5diff_641.txt
+./tools/test/h5diff/testfiles/h5diff_642.txt
+./tools/test/h5diff/testfiles/h5diff_643.txt
+./tools/test/h5diff/testfiles/h5diff_644.txt
+./tools/test/h5diff/testfiles/h5diff_645.txt
+./tools/test/h5diff/testfiles/h5diff_646.txt
+./tools/test/h5diff/testfiles/h5diff_70.txt
+./tools/test/h5diff/testfiles/h5diff_700.txt
+./tools/test/h5diff/testfiles/h5diff_701.txt
+./tools/test/h5diff/testfiles/h5diff_702.txt
+./tools/test/h5diff/testfiles/h5diff_703.txt
+./tools/test/h5diff/testfiles/h5diff_704.txt
+./tools/test/h5diff/testfiles/h5diff_705.txt
+./tools/test/h5diff/testfiles/h5diff_706.txt
+./tools/test/h5diff/testfiles/h5diff_707.txt
+./tools/test/h5diff/testfiles/h5diff_708.txt
+./tools/test/h5diff/testfiles/h5diff_709.txt
+./tools/test/h5diff/testfiles/h5diff_710.txt
+./tools/test/h5diff/testfiles/h5diff_80.txt
+./tools/test/h5diff/testfiles/h5diff_90.txt
+./tools/test/h5diff/testfiles/h5diff_100.txt
+./tools/test/h5diff/testfiles/h5diff_101.txt
+./tools/test/h5diff/testfiles/h5diff_102.txt
+./tools/test/h5diff/testfiles/h5diff_103.txt
+./tools/test/h5diff/testfiles/h5diff_104.txt
 # w for Windows-specific
-./tools/h5diff/testfiles/h5diff_101w.txt
-./tools/h5diff/testfiles/h5diff_102w.txt
-./tools/h5diff/testfiles/h5diff_103w.txt
-./tools/h5diff/testfiles/h5diff_104w.txt
-./tools/h5diff/testfiles/h5diff_200.txt
-./tools/h5diff/testfiles/h5diff_201.txt
-./tools/h5diff/testfiles/h5diff_202.txt
-./tools/h5diff/testfiles/h5diff_203.txt
-./tools/h5diff/testfiles/h5diff_204.txt
-./tools/h5diff/testfiles/h5diff_205.txt
-./tools/h5diff/testfiles/h5diff_206.txt
-./tools/h5diff/testfiles/h5diff_207.txt
-./tools/h5diff/testfiles/h5diff_208.txt
-./tools/h5diff/testfiles/h5diff_220.txt
-./tools/h5diff/testfiles/h5diff_221.txt
-./tools/h5diff/testfiles/h5diff_222.txt
-./tools/h5diff/testfiles/h5diff_223.txt
-./tools/h5diff/testfiles/h5diff_224.txt
-./tools/h5diff/testfiles/h5diff_300.txt
-./tools/h5diff/testfiles/h5diff_400.txt
-./tools/h5diff/testfiles/h5diff_401.txt
-./tools/h5diff/testfiles/h5diff_402.txt
-./tools/h5diff/testfiles/h5diff_403.txt
-./tools/h5diff/testfiles/h5diff_404.txt
-./tools/h5diff/testfiles/h5diff_405.txt
-./tools/h5diff/testfiles/h5diff_406.txt
-./tools/h5diff/testfiles/h5diff_407.txt
-./tools/h5diff/testfiles/h5diff_408.txt
-./tools/h5diff/testfiles/h5diff_409.txt
-./tools/h5diff/testfiles/h5diff_410.txt
-./tools/h5diff/testfiles/h5diff_411.txt
-./tools/h5diff/testfiles/h5diff_412.txt
-./tools/h5diff/testfiles/h5diff_413.txt
-./tools/h5diff/testfiles/h5diff_414.txt
-./tools/h5diff/testfiles/h5diff_415.txt
-./tools/h5diff/testfiles/h5diff_416.txt
-./tools/h5diff/testfiles/h5diff_417.txt
-./tools/h5diff/testfiles/h5diff_418.txt
-./tools/h5diff/testfiles/h5diff_419.txt
-./tools/h5diff/testfiles/h5diff_420.txt
-./tools/h5diff/testfiles/h5diff_421.txt
-./tools/h5diff/testfiles/h5diff_422.txt
-./tools/h5diff/testfiles/h5diff_423.txt
-./tools/h5diff/testfiles/h5diff_424.txt
-./tools/h5diff/testfiles/h5diff_425.txt
-./tools/h5diff/testfiles/h5diff_450.txt
-./tools/h5diff/testfiles/h5diff_451.txt
-./tools/h5diff/testfiles/h5diff_452.txt
-./tools/h5diff/testfiles/h5diff_453.txt
-./tools/h5diff/testfiles/h5diff_454.txt
-./tools/h5diff/testfiles/h5diff_455.txt
-./tools/h5diff/testfiles/h5diff_456.txt
-./tools/h5diff/testfiles/h5diff_457.txt
-./tools/h5diff/testfiles/h5diff_458.txt
-./tools/h5diff/testfiles/h5diff_459.txt
-./tools/h5diff/testfiles/h5diff_465.txt
-./tools/h5diff/testfiles/h5diff_466.txt
-./tools/h5diff/testfiles/h5diff_467.txt
-./tools/h5diff/testfiles/h5diff_468.txt
-./tools/h5diff/testfiles/h5diff_469.txt
-./tools/h5diff/testfiles/h5diff_471.txt
-./tools/h5diff/testfiles/h5diff_472.txt
-./tools/h5diff/testfiles/h5diff_473.txt
-./tools/h5diff/testfiles/h5diff_474.txt
-./tools/h5diff/testfiles/h5diff_475.txt
-./tools/h5diff/testfiles/h5diff_480.txt
-./tools/h5diff/testfiles/h5diff_481.txt
-./tools/h5diff/testfiles/h5diff_482.txt
-./tools/h5diff/testfiles/h5diff_483.txt
-./tools/h5diff/testfiles/h5diff_484.txt
-./tools/h5diff/testfiles/h5diff_485.txt
-./tools/h5diff/testfiles/h5diff_486.txt
-./tools/h5diff/testfiles/h5diff_487.txt
-./tools/h5diff/testfiles/h5diff_500.txt
-./tools/h5diff/testfiles/h5diff_501.txt
-./tools/h5diff/testfiles/h5diff_502.txt
-./tools/h5diff/testfiles/h5diff_503.txt
-./tools/h5diff/testfiles/h5diff_504.txt
-./tools/h5diff/testfiles/h5diff_505.txt
-./tools/h5diff/testfiles/h5diff_506.txt
-./tools/h5diff/testfiles/h5diff_507.txt
-./tools/h5diff/testfiles/h5diff_508.txt
-./tools/h5diff/testfiles/h5diff_509.txt
-./tools/h5diff/testfiles/h5diff_510.txt
-./tools/h5diff/testfiles/h5diff_511.txt
-./tools/h5diff/testfiles/h5diff_512.txt
-./tools/h5diff/testfiles/h5diff_513.txt
-./tools/h5diff/testfiles/h5diff_514.txt
-./tools/h5diff/testfiles/h5diff_515.txt
-./tools/h5diff/testfiles/h5diff_516.txt
-./tools/h5diff/testfiles/h5diff_517.txt
-./tools/h5diff/testfiles/h5diff_518.txt
-./tools/h5diff/testfiles/h5diff_530.txt
-./tools/h5diff/testfiles/h5diff_540.txt
-
-./tools/h5diff/testfiles/h5diff_attr1.h5
-./tools/h5diff/testfiles/h5diff_attr2.h5
-./tools/h5diff/testfiles/h5diff_attr_v_level1.h5
-./tools/h5diff/testfiles/h5diff_attr_v_level2.h5
-./tools/h5diff/testfiles/h5diff_basic1.h5
-./tools/h5diff/testfiles/h5diff_basic2.h5
-./tools/h5diff/testfiles/h5diff_dset1.h5
-./tools/h5diff/testfiles/h5diff_dset2.h5
-./tools/h5diff/testfiles/h5diff_dtypes.h5
-./tools/h5diff/testfiles/h5diff_empty.h5
-./tools/h5diff/testfiles/h5diff_hyper1.h5
-./tools/h5diff/testfiles/h5diff_hyper2.h5
-./tools/h5diff/testfiles/h5diff_types.h5
-./tools/h5diff/testfiles/h5diff_links.h5
-./tools/h5diff/testfiles/h5diff_ext2softlink_src.h5
-./tools/h5diff/testfiles/h5diff_ext2softlink_trg.h5
-./tools/h5diff/testfiles/h5diff_extlink_src.h5
-./tools/h5diff/testfiles/h5diff_extlink_trg.h5
-./tools/h5diff/testfiles/h5diff_linked_softlink.h5
-./tools/h5diff/testfiles/h5diff_softlinks.h5
-./tools/h5diff/testfiles/h5diff_danglelinks1.h5
-./tools/h5diff/testfiles/h5diff_danglelinks2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-1.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-2.h5
-./tools/h5diff/testfiles/h5diff_grp_recurse_ext2-3.h5
-./tools/h5diff/testfiles/h5diff_exclude1-1.h5
-./tools/h5diff/testfiles/h5diff_exclude1-2.h5
-./tools/h5diff/testfiles/h5diff_exclude2-1.h5
-./tools/h5diff/testfiles/h5diff_exclude2-2.h5
-./tools/h5diff/testfiles/h5diff_exclude3-1.h5
-./tools/h5diff/testfiles/h5diff_exclude3-2.h5
-./tools/h5diff/testfiles/h5diff_comp_vl_strs.h5
-./tools/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5
-./tools/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5
-./tools/h5diff/testfiles/h5diff_enum_invalid_values.h5
-./tools/h5diff/testfiles/compounds_array_vlen1.h5
-./tools/h5diff/testfiles/compounds_array_vlen2.h5
-./tools/h5diff/testfiles/non_comparables1.h5
-./tools/h5diff/testfiles/non_comparables2.h5
-./tools/h5diff/testfiles/tmptest2.he5
-./tools/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
-./tools/h5diff/testfiles/h5diff_tmp1.txt
-./tools/h5diff/testfiles/tmptest.he5
-./tools/h5diff/testfiles/h5diff_tmp2.txt
-./tools/h5diff/testfiles/tmpSingleSiteBethe.output.h5
+./tools/test/h5diff/testfiles/h5diff_101w.txt
+./tools/test/h5diff/testfiles/h5diff_102w.txt
+./tools/test/h5diff/testfiles/h5diff_103w.txt
+./tools/test/h5diff/testfiles/h5diff_104w.txt
+./tools/test/h5diff/testfiles/h5diff_200.txt
+./tools/test/h5diff/testfiles/h5diff_201.txt
+./tools/test/h5diff/testfiles/h5diff_202.txt
+./tools/test/h5diff/testfiles/h5diff_203.txt
+./tools/test/h5diff/testfiles/h5diff_204.txt
+./tools/test/h5diff/testfiles/h5diff_205.txt
+./tools/test/h5diff/testfiles/h5diff_206.txt
+./tools/test/h5diff/testfiles/h5diff_207.txt
+./tools/test/h5diff/testfiles/h5diff_208.txt
+./tools/test/h5diff/testfiles/h5diff_220.txt
+./tools/test/h5diff/testfiles/h5diff_221.txt
+./tools/test/h5diff/testfiles/h5diff_222.txt
+./tools/test/h5diff/testfiles/h5diff_223.txt
+./tools/test/h5diff/testfiles/h5diff_224.txt
+./tools/test/h5diff/testfiles/h5diff_300.txt
+./tools/test/h5diff/testfiles/h5diff_400.txt
+./tools/test/h5diff/testfiles/h5diff_401.txt
+./tools/test/h5diff/testfiles/h5diff_402.txt
+./tools/test/h5diff/testfiles/h5diff_403.txt
+./tools/test/h5diff/testfiles/h5diff_404.txt
+./tools/test/h5diff/testfiles/h5diff_405.txt
+./tools/test/h5diff/testfiles/h5diff_406.txt
+./tools/test/h5diff/testfiles/h5diff_407.txt
+./tools/test/h5diff/testfiles/h5diff_408.txt
+./tools/test/h5diff/testfiles/h5diff_409.txt
+./tools/test/h5diff/testfiles/h5diff_410.txt
+./tools/test/h5diff/testfiles/h5diff_411.txt
+./tools/test/h5diff/testfiles/h5diff_412.txt
+./tools/test/h5diff/testfiles/h5diff_413.txt
+./tools/test/h5diff/testfiles/h5diff_414.txt
+./tools/test/h5diff/testfiles/h5diff_415.txt
+./tools/test/h5diff/testfiles/h5diff_416.txt
+./tools/test/h5diff/testfiles/h5diff_417.txt
+./tools/test/h5diff/testfiles/h5diff_418.txt
+./tools/test/h5diff/testfiles/h5diff_419.txt
+./tools/test/h5diff/testfiles/h5diff_420.txt
+./tools/test/h5diff/testfiles/h5diff_421.txt
+./tools/test/h5diff/testfiles/h5diff_422.txt
+./tools/test/h5diff/testfiles/h5diff_423.txt
+./tools/test/h5diff/testfiles/h5diff_424.txt
+./tools/test/h5diff/testfiles/h5diff_425.txt
+./tools/test/h5diff/testfiles/h5diff_450.txt
+./tools/test/h5diff/testfiles/h5diff_451.txt
+./tools/test/h5diff/testfiles/h5diff_452.txt
+./tools/test/h5diff/testfiles/h5diff_453.txt
+./tools/test/h5diff/testfiles/h5diff_454.txt
+./tools/test/h5diff/testfiles/h5diff_455.txt
+./tools/test/h5diff/testfiles/h5diff_456.txt
+./tools/test/h5diff/testfiles/h5diff_457.txt
+./tools/test/h5diff/testfiles/h5diff_458.txt
+./tools/test/h5diff/testfiles/h5diff_459.txt
+./tools/test/h5diff/testfiles/h5diff_465.txt
+./tools/test/h5diff/testfiles/h5diff_466.txt
+./tools/test/h5diff/testfiles/h5diff_467.txt
+./tools/test/h5diff/testfiles/h5diff_468.txt
+./tools/test/h5diff/testfiles/h5diff_469.txt
+./tools/test/h5diff/testfiles/h5diff_471.txt
+./tools/test/h5diff/testfiles/h5diff_472.txt
+./tools/test/h5diff/testfiles/h5diff_473.txt
+./tools/test/h5diff/testfiles/h5diff_474.txt
+./tools/test/h5diff/testfiles/h5diff_475.txt
+./tools/test/h5diff/testfiles/h5diff_480.txt
+./tools/test/h5diff/testfiles/h5diff_481.txt
+./tools/test/h5diff/testfiles/h5diff_482.txt
+./tools/test/h5diff/testfiles/h5diff_483.txt
+./tools/test/h5diff/testfiles/h5diff_484.txt
+./tools/test/h5diff/testfiles/h5diff_485.txt
+./tools/test/h5diff/testfiles/h5diff_486.txt
+./tools/test/h5diff/testfiles/h5diff_487.txt
+./tools/test/h5diff/testfiles/h5diff_500.txt
+./tools/test/h5diff/testfiles/h5diff_501.txt
+./tools/test/h5diff/testfiles/h5diff_502.txt
+./tools/test/h5diff/testfiles/h5diff_503.txt
+./tools/test/h5diff/testfiles/h5diff_504.txt
+./tools/test/h5diff/testfiles/h5diff_505.txt
+./tools/test/h5diff/testfiles/h5diff_506.txt
+./tools/test/h5diff/testfiles/h5diff_507.txt
+./tools/test/h5diff/testfiles/h5diff_508.txt
+./tools/test/h5diff/testfiles/h5diff_509.txt
+./tools/test/h5diff/testfiles/h5diff_510.txt
+./tools/test/h5diff/testfiles/h5diff_511.txt
+./tools/test/h5diff/testfiles/h5diff_512.txt
+./tools/test/h5diff/testfiles/h5diff_513.txt
+./tools/test/h5diff/testfiles/h5diff_514.txt
+./tools/test/h5diff/testfiles/h5diff_515.txt
+./tools/test/h5diff/testfiles/h5diff_516.txt
+./tools/test/h5diff/testfiles/h5diff_517.txt
+./tools/test/h5diff/testfiles/h5diff_518.txt
+./tools/test/h5diff/testfiles/h5diff_530.txt
+./tools/test/h5diff/testfiles/h5diff_540.txt
+
+./tools/test/h5diff/testfiles/h5diff_attr1.h5
+./tools/test/h5diff/testfiles/h5diff_attr2.h5
+./tools/test/h5diff/testfiles/h5diff_attr_v_level1.h5
+./tools/test/h5diff/testfiles/h5diff_attr_v_level2.h5
+./tools/test/h5diff/testfiles/h5diff_basic1.h5
+./tools/test/h5diff/testfiles/h5diff_basic2.h5
+./tools/test/h5diff/testfiles/h5diff_dset1.h5
+./tools/test/h5diff/testfiles/h5diff_dset2.h5
+./tools/test/h5diff/testfiles/h5diff_dtypes.h5
+./tools/test/h5diff/testfiles/h5diff_empty.h5
+./tools/test/h5diff/testfiles/h5diff_hyper1.h5
+./tools/test/h5diff/testfiles/h5diff_hyper2.h5
+./tools/test/h5diff/testfiles/h5diff_types.h5
+./tools/test/h5diff/testfiles/h5diff_links.h5
+./tools/test/h5diff/testfiles/h5diff_ext2softlink_src.h5
+./tools/test/h5diff/testfiles/h5diff_ext2softlink_trg.h5
+./tools/test/h5diff/testfiles/h5diff_extlink_src.h5
+./tools/test/h5diff/testfiles/h5diff_extlink_trg.h5
+./tools/test/h5diff/testfiles/h5diff_linked_softlink.h5
+./tools/test/h5diff/testfiles/h5diff_softlinks.h5
+./tools/test/h5diff/testfiles/h5diff_danglelinks1.h5
+./tools/test/h5diff/testfiles/h5diff_danglelinks2.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse1.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse2.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse_ext1.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse_ext2-1.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse_ext2-2.h5
+./tools/test/h5diff/testfiles/h5diff_grp_recurse_ext2-3.h5
+./tools/test/h5diff/testfiles/h5diff_exclude1-1.h5
+./tools/test/h5diff/testfiles/h5diff_exclude1-2.h5
+./tools/test/h5diff/testfiles/h5diff_exclude2-1.h5
+./tools/test/h5diff/testfiles/h5diff_exclude2-2.h5
+./tools/test/h5diff/testfiles/h5diff_exclude3-1.h5
+./tools/test/h5diff/testfiles/h5diff_exclude3-2.h5
+./tools/test/h5diff/testfiles/h5diff_comp_vl_strs.h5
+./tools/test/h5diff/testfiles/h5diff_dset_zero_dim_size1.h5
+./tools/test/h5diff/testfiles/h5diff_dset_zero_dim_size2.h5
+./tools/test/h5diff/testfiles/h5diff_enum_invalid_values.h5
+./tools/test/h5diff/testfiles/compounds_array_vlen1.h5
+./tools/test/h5diff/testfiles/compounds_array_vlen2.h5
+./tools/test/h5diff/testfiles/non_comparables1.h5
+./tools/test/h5diff/testfiles/non_comparables2.h5
+./tools/test/h5diff/testfiles/tmptest2.he5
+./tools/test/h5diff/testfiles/tmpSingleSiteBethe.reference.h5
+./tools/test/h5diff/testfiles/h5diff_tmp1.txt
+./tools/test/h5diff/testfiles/tmptest.he5
+./tools/test/h5diff/testfiles/h5diff_tmp2.txt
+./tools/test/h5diff/testfiles/tmpSingleSiteBethe.output.h5
 #vds
-./tools/h5diff/testfiles/h5diff_v1.txt
-./tools/h5diff/testfiles/h5diff_v2.txt
-./tools/h5diff/testfiles/h5diff_v3.txt
+./tools/test/h5diff/testfiles/h5diff_v1.txt
+./tools/test/h5diff/testfiles/h5diff_v2.txt
+./tools/test/h5diff/testfiles/h5diff_v3.txt
 
 #test files for h5repack
-./tools/h5repack/testfiles/README
-./tools/h5repack/testfiles/h5repack_attr.h5
-./tools/h5repack/testfiles/h5repack_attr_refs.h5
-./tools/h5repack/testfiles/h5repack_deflate.h5
-./tools/h5repack/testfiles/h5repack_early.h5
-./tools/h5repack/testfiles/h5repack_ext.bin
-./tools/h5repack/testfiles/h5repack_ext.h5
-./tools/h5repack/testfiles/h5repack_fill.h5
-./tools/h5repack/testfiles/h5repack_filters.h5
-./tools/h5repack/testfiles/h5repack_fletcher.h5
-./tools/h5repack/testfiles/h5repack_hlink.h5
-./tools/h5repack/testfiles/h5repack.info
-./tools/h5repack/testfiles/h5repack_layout.h5
-./tools/h5repack/testfiles/h5repack_layouto.h5
-./tools/h5repack/testfiles/h5repack_layout2.h5
-./tools/h5repack/testfiles/h5repack_layout3.h5
-./tools/h5repack/testfiles/h5repack_layout.UD.h5
-./tools/h5repack/testfiles/h5repack_named_dtypes.h5
-./tools/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5
-./tools/h5repack/testfiles/h5repack_nested_8bit_enum.h5
-./tools/h5repack/testfiles/h5repack_nbit.h5
-./tools/h5repack/testfiles/h5repack_objs.h5
-./tools/h5repack/testfiles/h5repack_refs.h5
-./tools/h5repack/testfiles/h5repack_shuffle.h5
-./tools/h5repack/testfiles/h5repack_soffset.h5
-./tools/h5repack/testfiles/h5repack_szip.h5
-./tools/h5repack/testfiles/ublock.bin
-./tools/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
-./tools/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
-./tools/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
-./tools/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
-./tools/h5repack/testfiles/h5repack-help.txt
-./tools/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
-./tools/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
-./tools/h5repack/testfiles/h5repack_layout.h5.ddl
-./tools/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
-./tools/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
-./tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
-./tools/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
+./tools/test/h5repack/testfiles/README
+./tools/test/h5repack/testfiles/h5repack_attr.h5
+./tools/test/h5repack/testfiles/h5repack_attr_refs.h5
+./tools/test/h5repack/testfiles/h5repack_deflate.h5
+./tools/test/h5repack/testfiles/h5repack_early.h5
+./tools/test/h5repack/testfiles/h5repack_ext.bin
+./tools/test/h5repack/testfiles/h5repack_ext.h5
+./tools/test/h5repack/testfiles/h5repack_fill.h5
+./tools/test/h5repack/testfiles/h5repack_filters.h5
+./tools/test/h5repack/testfiles/h5repack_fletcher.h5
+./tools/test/h5repack/testfiles/h5repack_hlink.h5
+./tools/test/h5repack/testfiles/h5repack.info
+./tools/test/h5repack/testfiles/h5repack_layout.h5
+./tools/test/h5repack/testfiles/h5repack_layouto.h5
+./tools/test/h5repack/testfiles/h5repack_layout2.h5
+./tools/test/h5repack/testfiles/h5repack_layout3.h5
+./tools/test/h5repack/testfiles/h5repack_layout.UD.h5
+./tools/test/h5repack/testfiles/h5repack_named_dtypes.h5
+./tools/test/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5
+./tools/test/h5repack/testfiles/h5repack_nested_8bit_enum.h5
+./tools/test/h5repack/testfiles/h5repack_nbit.h5
+./tools/test/h5repack/testfiles/h5repack_objs.h5
+./tools/test/h5repack/testfiles/h5repack_refs.h5
+./tools/test/h5repack/testfiles/h5repack_shuffle.h5
+./tools/test/h5repack/testfiles/h5repack_soffset.h5
+./tools/test/h5repack/testfiles/h5repack_szip.h5
+./tools/test/h5repack/testfiles/ublock.bin
+./tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+./tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+./tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
+./tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
+./tools/test/h5repack/testfiles/h5repack-help.txt
+./tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+./tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+./tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
+./tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
+./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+./tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
 ./tools/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
 ./tools/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
 ./tools/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
@@ -2325,37 +2335,38 @@
 ./tools/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
 
 # jam utility and tests
-./tools/h5jam/h5jam.c
-./tools/h5jam/h5unjam.c
-./tools/h5jam/Makefile.am
-./tools/h5jam/h5jamgentest.c
-./tools/h5jam/testh5jam.sh.in
-./tools/h5jam/tellub.c
-./tools/h5jam/getub.c
+./tools/src/h5jam/Makefile.am
+./tools/src/h5jam/h5jam.c
+./tools/src/h5jam/h5unjam.c
+./tools/test/h5jam/Makefile.am
+./tools/test/h5jam/h5jamgentest.c
+./tools/test/h5jam/testh5jam.sh.in
+./tools/test/h5jam/tellub.c
+./tools/test/h5jam/getub.c
 
 # test files for jam
-./tools/h5jam/testfiles/h5jam-help.txt
-./tools/h5jam/testfiles/h5unjam-help.txt
-./tools/h5jam/testfiles/tall.h5
-./tools/h5jam/testfiles/twithub.h5
-./tools/h5jam/testfiles/twithub513.h5
-./tools/h5jam/testfiles/u10.txt
-./tools/h5jam/testfiles/u511.txt
-./tools/h5jam/testfiles/u512.txt
-./tools/h5jam/testfiles/u513.txt
-./tools/h5jam/testfiles/h5jam-ub-nohdf5.txt
+./tools/test/h5jam/testfiles/h5jam-help.txt
+./tools/test/h5jam/testfiles/h5unjam-help.txt
+./tools/test/h5jam/testfiles/tall.h5
+./tools/test/h5jam/testfiles/twithub.h5
+./tools/test/h5jam/testfiles/twithub513.h5
+./tools/test/h5jam/testfiles/u10.txt
+./tools/test/h5jam/testfiles/u511.txt
+./tools/test/h5jam/testfiles/u512.txt
+./tools/test/h5jam/testfiles/u513.txt
+./tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt
 
 # test files for h5copy
-./tools/h5copy/testfiles/h5copytst.h5
-./tools/h5copy/testfiles/h5copytst.out.ls
-./tools/h5copy/testfiles/h5copy_ref.h5
-./tools/h5copy/testfiles/h5copy_ref.out.ls
-./tools/h5copy/testfiles/h5copy_extlinks_src.h5
-./tools/h5copy/testfiles/h5copy_extlinks_trg.h5
-./tools/h5copy/testfiles/h5copy_extlinks_src.out.ls
-./tools/h5copy/testfiles/h5copy_misc1.out
-./tools/h5copy/testfiles/h5copytst_new.h5
-./tools/h5copy/testfiles/h5copytst_new.out.ls
+./tools/test/h5copy/testfiles/h5copytst.h5
+./tools/test/h5copy/testfiles/h5copytst.out.ls
+./tools/test/h5copy/testfiles/h5copy_ref.h5
+./tools/test/h5copy/testfiles/h5copy_ref.out.ls
+./tools/test/h5copy/testfiles/h5copy_extlinks_src.h5
+./tools/test/h5copy/testfiles/h5copy_extlinks_trg.h5
+./tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls
+./tools/test/h5copy/testfiles/h5copy_misc1.out
+./tools/test/h5copy/testfiles/h5copytst_new.h5
+./tools/test/h5copy/testfiles/h5copytst_new.out.ls
 
 # test files for h5mkgrp
 ./tools/testfiles/h5mkgrp_nested_p.ls
@@ -2371,27 +2382,27 @@
 ./tools/testfiles/h5mkgrp_single_p.ls
 ./tools/testfiles/h5mkgrp_single_l.ls
 
-./tools/perform/COPYING
-./tools/perform/Makefile.am
-./tools/perform/build_h5perf_alone.sh
-./tools/perform/build_h5perf_serial_alone.sh
-./tools/perform/chunk.c
-./tools/perform/gen_report.pl
-./tools/perform/iopipe.c
-./tools/perform/overhead.c
-./tools/perform/perf.c
-./tools/perform/perf_meta.c
-./tools/perform/pio_engine.c
-./tools/perform/pio_perf.c
-./tools/perform/pio_perf.h
-./tools/perform/pio_standalone.c
-./tools/perform/pio_standalone.h
-./tools/perform/sio_engine.c
-./tools/perform/sio_perf.c
-./tools/perform/sio_perf.h
-./tools/perform/sio_standalone.c
-./tools/perform/sio_standalone.h
-./tools/perform/zip_perf.c
+./tools/test/perform/COPYING
+./tools/test/perform/Makefile.am
+./tools/test/perform/build_h5perf_alone.sh
+./tools/test/perform/build_h5perf_serial_alone.sh
+./tools/test/perform/chunk.c
+./tools/test/perform/gen_report.pl
+./tools/test/perform/iopipe.c
+./tools/test/perform/overhead.c
+./tools/test/perform/perf.c
+./tools/test/perform/perf_meta.c
+./tools/test/perform/pio_engine.c
+./tools/test/perform/pio_perf.c
+./tools/test/perform/pio_perf.h
+./tools/test/perform/pio_standalone.c
+./tools/test/perform/pio_standalone.h
+./tools/test/perform/sio_engine.c
+./tools/test/perform/sio_perf.c
+./tools/test/perform/sio_perf.h
+./tools/test/perform/sio_standalone.c
+./tools/test/perform/sio_standalone.h
+./tools/test/perform/zip_perf.c
 
 # high level libraries
 ./hl/COPYING
@@ -2945,33 +2956,43 @@
 ./testpar/CMakeLists.txt
 ./testpar/CMakeTests.cmake
 ./tools/CMakeLists.txt
-./tools/h5copy/CMakeLists.txt
-./tools/h5copy/CMakeTests.cmake
-./tools/h5diff/CMakeLists.txt
-./tools/h5diff/CMakeTests.cmake
-./tools/h5dump/CMakeLists.txt
-./tools/h5dump/CMakeTests.cmake
-./tools/h5dump/CMakeTestsPBITS.cmake
-./tools/h5dump/CMakeTestsXML.cmake
-./tools/h5dump/CMakeTestsVDS.cmake
-./tools/h5format_convert/CMakeLists.txt
-./tools/h5format_convert/CMakeTests.cmake
-./tools/h5import/CMakeLists.txt
-./tools/h5import/CMakeTests.cmake
-./tools/h5jam/CMakeLists.txt
-./tools/h5jam/CMakeTests.cmake
-./tools/h5ls/CMakeLists.txt
-./tools/h5ls/CMakeTests.cmake
-./tools/h5repack/CMakeLists.txt
-./tools/h5repack/CMakeTests.cmake
-./tools/h5stat/CMakeLists.txt
-./tools/h5stat/CMakeTests.cmake
 ./tools/lib/CMakeLists.txt
-./tools/misc/CMakeLists.txt
-./tools/misc/CMakeTests.cmake
-./tools/misc/vds/CMakeLists.txt
-./tools/perform/CMakeLists.txt
-./tools/perform/CMakeTests.cmake
+./tools/src/CMakeLists.txt
+./tools/test/CMakeLists.txt
+./tools/src/h5copy/CMakeLists.txt
+./tools/test/h5copy/CMakeLists.txt
+./tools/test/h5copy/CMakeTests.cmake
+./tools/src/h5diff/CMakeLists.txt
+./tools/test/h5diff/CMakeLists.txt
+./tools/test/h5diff/CMakeTests.cmake
+./tools/src/h5dump/CMakeLists.txt
+./tools/test/h5dump/CMakeLists.txt
+./tools/test/h5dump/CMakeTests.cmake
+./tools/test/h5dump/CMakeTestsPBITS.cmake
+./tools/test/h5dump/CMakeTestsXML.cmake
+./tools/test/h5dump/CMakeTestsVDS.cmake
+./tools/src/h5import/CMakeLists.txt
+./tools/test/h5import/CMakeLists.txt
+./tools/test/h5import/CMakeTests.cmake
+./tools/src/h5jam/CMakeLists.txt
+./tools/test/h5jam/CMakeLists.txt
+./tools/test/h5jam/CMakeTests.cmake
+./tools/src/h5ls/CMakeLists.txt
+./tools/test/h5ls/CMakeLists.txt
+./tools/test/h5ls/CMakeTests.cmake
+./tools/test/h5ls/CMakeTestsVDS.cmake
+./tools/src/h5repack/CMakeLists.txt
+./tools/test/h5repack/CMakeLists.txt
+./tools/test/h5repack/CMakeTests.cmake
+./tools/src/h5stat/CMakeLists.txt
+./tools/test/h5stat/CMakeLists.txt
+./tools/test/h5stat/CMakeTests.cmake
+./tools/src/misc/CMakeLists.txt
+./tools/test/misc/CMakeLists.txt
+./tools/test/misc/CMakeTests.cmake
+./tools/test/misc/vds/CMakeLists.txt
+./tools/test/perform/CMakeLists.txt
+./tools/test/perform/CMakeTests.cmake
 
 # CMake-specific User Scripts
 ./config/cmake/scripts/CTestScript.cmake
@@ -3028,17 +3049,31 @@
 ./src/Makefile.in
 ./test/Makefile.in
 ./testpar/Makefile.in
-./tools/h5copy/Makefile.in
-./tools/h5diff/Makefile.in
-./tools/h5dump/Makefile.in
-./tools/h5format_convert/Makefile.in
-./tools/h5import/Makefile.in
-./tools/h5jam/Makefile.in
-./tools/h5ls/Makefile.in
-./tools/h5repack/Makefile.in
-./tools/h5stat/Makefile.in
+./tools/src/h5copy/Makefile.in
+./tools/src/h5diff/Makefile.in
+./tools/src/h5dump/Makefile.in
+./tools/src/h5format_convert/Makefile.in
+./tools/src/h5import/Makefile.in
+./tools/src/h5jam/Makefile.in
+./tools/src/h5ls/Makefile.in
+./tools/src/h5repack/Makefile.in
+./tools/src/h5stat/Makefile.in
 ./tools/lib/Makefile.in
 ./tools/Makefile.in
-./tools/misc/Makefile.in
-./tools/misc/vds/Makefile.in
-./tools/perform/Makefile.in
+./tools/src/Makefile.in
+./tools/test/Makefile.in
+./tools/src/misc/Makefile.in
+./tools/src/misc/vds/Makefile.in
+./tools/src/perform/Makefile.in
+./tools/test/h5copy/Makefile.in
+./tools/test/h5diff/Makefile.in
+./tools/test/h5dump/Makefile.in
+./tools/test/h5format_convert/Makefile.in
+./tools/test/h5import/Makefile.in
+./tools/test/h5jam/Makefile.in
+./tools/test/h5ls/Makefile.in
+./tools/test/h5repack/Makefile.in
+./tools/test/h5stat/Makefile.in
+./tools/test/misc/Makefile.in
+./tools/test/misc/vds/Makefile.in
+./tools/test/perform/Makefile.in