59 files changed, 296 insertions, 274 deletions

diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index bd2cb9b..5c41254 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -19,203 +19,224 @@
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
-  set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/bounds_latest_latest.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_deflate.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_early.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fill.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fletcher.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_hlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-17432.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-14460.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_shuffle.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_soffset.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_szip.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-2.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-3.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex.h5
+  set (LIST_REPACK_TEST_FILES
+      bounds_latest_latest.h5
+      h5repack_attr.h5
+      h5repack_attr_refs.h5
+      h5repack_deflate.h5
+      h5repack_early.h5
+      h5repack_ext.h5
+      h5repack_f32le.h5
+      h5repack_f32le_ex-0.dat
+      h5repack_f32le_ex.h5
+      h5repack_fill.h5
+      h5repack_filters.h5
+      h5repack_fletcher.h5
+      h5repack_hlink.h5
+      h5repack_int32le_1d.h5
+      h5repack_int32le_1d_ex-0.dat
+      h5repack_int32le_1d_ex-1.dat
+      h5repack_int32le_1d_ex.h5
+      h5repack_int32le_2d.h5
+      h5repack_int32le_2d_ex-0.dat
+      h5repack_int32le_2d_ex.h5
+      h5repack_int32le_3d.h5
+      h5repack_int32le_3d_ex-0.dat
+      h5repack_int32le_3d_ex.h5
+      h5repack_layout.h5
+      h5repack_layouto.h5
+      h5repack_layout2.h5
+      h5repack_layout3.h5
+      h5repack_layout.UD.h5
+      h5repack_named_dtypes.h5
+      h5repack_nested_8bit_enum.h5
+      h5repack_nested_8bit_enum_deflated.h5
+      h5repack_CVE-2018-17432.h5
+      h5repack_CVE-2018-14460.h5
+      h5repack_nbit.h5
+      h5repack_objs.h5
+      h5repack_refs.h5
+      h5repack_shuffle.h5
+      h5repack_soffset.h5
+      h5repack_szip.h5
+      h5repack_uint8be.h5
+      h5repack_uint8be_ex-0.dat
+      h5repack_uint8be_ex-1.dat
+      h5repack_uint8be_ex-2.dat
+      h5repack_uint8be_ex-3.dat
+      h5repack_uint8be_ex.h5
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_persist.h5
-      # h5diff/testfile
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
+      h5repack_aggr.h5
+      h5repack_fsm_aggr_nopersist.h5
+      h5repack_fsm_aggr_persist.h5
+      h5repack_none.h5
+      h5repack_paged_nopersist.h5
+      h5repack_paged_persist.h5
+  )
+  # h5diff/testfile
+  set (LIST_DIFF_TEST_FILES
+      h5diff_attr1.h5
+  )
+  # tools/testfiles/vds
+  set (LIST_VDS_TEST_FILES
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (LIST_COPY_TEST_FILES
+      h5copy_extlinks_src.h5
+      h5copy_extlinks_trg.h5
+  )
+  set (LIST_HDF5_TEST_FILES
       # tools/testfiles for external links
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
+      tsoftlinks.h5
+      textlinkfar.h5
+      textlinksrc.h5
+      textlinktar.h5
+      textlink.h5
       # tools/testfiles
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
+      tfamily00000.h5
+      tfamily00001.h5
+      tfamily00002.h5
+      tfamily00003.h5
+      tfamily00004.h5
+      tfamily00005.h5
+      tfamily00006.h5
+      tfamily00007.h5
+      tfamily00008.h5
+      tfamily00009.h5
+      tfamily00010.h5
+      tordergr.h5
       # reference conversion files
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      # tools/testfiles/vds
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
+      tattrreg.h5
+      tdatareg.h5
       # tools/testfiles onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion
+      tst_onion_dset_1d.h5
+      tst_onion_dset_1d.h5.onion
+      tst_onion_dset_ext.h5
+      tst_onion_dset_ext.h5.onion
+      tst_onion_objs.h5
+      tst_onion_objs.h5.onion
   )
 
   set (LIST_OTHER_TEST_FILES
-      h5repack-help.txt
       h5repack_ext.bin
       h5repack.info
       ublock.bin
   )
 
   set (LIST_TST_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5
+      h5repack-help.txt
+      h5repack_filters.h5-gzip_verbose_filters.tst
+      h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+      plugin_test.h5repack_layout.h5.tst
+      plugin_version_test.h5repack_layout.h5.tst
+      plugin_zero.h5repack_layout.h5.tst
+      plugin_none.h5repack_layout.UD.h5.tst
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-merge.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-merge.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-merge.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-merge.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-merge.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5
+      tsoftlinks-merge.tsoftlinks.h5.tst
+      textlinkfar-merge.textlinkfar.h5.tst
+      textlinksrc-merge.textlinksrc.h5.tst
+      textlinktar-merge.textlinktar.h5.tst
+      textlink-merge.textlink.h5.tst
+      h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
   )
 
   set (LIST_DDL_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none
+      crtorder.tordergr.h5.ddl
+      deflate_limit.h5repack_layout.h5.ddl
+      h5repack_layout.h5.ddl
+      h5repack_layout.h5-plugin_test.ddl
+      h5repack_layout.h5-plugin_version_test.ddl
+      h5repack_layout.h5-plugin_zero.ddl
+      h5repack_layout.UD.h5-plugin_none.ddl
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/STG.h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SPT.h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/S.h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/GS.h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_paged_persist.h5
+      STG.h5repack_none.h5.ddl
+      SPT.h5repack_aggr.h5.ddl
+      SP.h5repack_fsm_aggr_nopersist.h5.ddl
+      S.h5repack_fsm_aggr_persist.h5.ddl
+      GS.h5repack_paged_nopersist.h5.ddl
+      SP.h5repack_paged_persist.h5.ddl
       # vds
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v
+      1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+      2_vds.h5-vds_chunk3x6x9-v.ddl
+      3_1_vds.h5-vds_chunk2x5x8-v.ddl
+      4_vds.h5-vds_compa-v.ddl
+      4_vds.h5-vds_conti-v.ddl
       # refs
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/attrregion.tattrreg.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/dataregion.tdatareg.h5
+      attrregion.tattrreg.h5.ddl
+      dataregion.tdatareg.h5.ddl
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-base.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-base.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-base.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-base.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-base.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-prune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-prune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-prune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-prune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-prune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-mergeprune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-mergeprune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-mergeprune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-mergeprune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5
+      textlinkfar-base.textlinkfar.h5.ddl
+      textlinksrc-base.textlinksrc.h5.ddl
+      textlinktar-base.textlinktar.h5.ddl
+      textlink-base.textlink.h5.ddl
+      tsoftlinks-base.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+      textlinkfar-prune.textlinkfar.h5.ddl
+      textlinksrc-prune.textlinksrc.h5.ddl
+      textlinktar-prune.textlinktar.h5.ddl
+      textlink-prune.textlink.h5.ddl
+      tsoftlinks-prune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+      textlinkfar-mergeprune.textlinkfar.h5.ddl
+      textlinksrc-mergeprune.textlinksrc.h5.ddl
+      textlinktar-mergeprune.textlinktar.h5.ddl
+      textlink-mergeprune.textlink.h5.ddl
+      tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
   )
 
+  foreach (h5_file ${LIST_REPACK_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_COPY_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_DIFF_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_VDS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
   foreach (h5_file ${LIST_HDF5_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_OTHER_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_TST_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_DDL_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
   add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list})
 
diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
index fab9494..fab9494 100644
--- a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+++ b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
index 51df9dd..51df9dd 100644
--- a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
+++ b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
index dcd172c..dcd172c 100644
--- a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+++ b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
index 1e8927c..1e8927c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
index 54bf26c..54bf26c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
diff --git a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
index d8ca992..d8ca992 100644
--- a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
index 87ccbc4..87ccbc4 100644
--- a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl
+++ b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
index e78c5e2..e78c5e2 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
index 1084090..1084090 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
index 3ecf9b1..3ecf9b1 100644
--- a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl
+++ b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
index 51cd7e5..51cd7e5 100644
--- a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl
+++ b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
diff --git a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
index 7cab02b..7cab02b 100644
--- a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl
+++ b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
index 870d154..870d154 100644
--- a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl
+++ b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
index bd31118..bd31118 100644
--- a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl
+++ b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
index 75f54fa..75f54fa 100644
--- a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
index 52f215d..52f215d 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
index b7d7bca..b7d7bca 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/expected/h5repack-help.txt
index b291a68..b291a68 100644
--- a/tools/test/h5repack/testfiles/h5repack-help.txt
+++ b/tools/test/h5repack/expected/h5repack-help.txt
diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
index cb12172..cb12172 100644
--- a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+++ b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
index 66c4c69..66c4c69 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 3d9f0c2..3d9f0c2 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
index a8b4562..a8b4562 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
index d7aa1c3..d7aa1c3 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
index e4ffaf1..e4ffaf1 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
index 00c74f4..00c74f4 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
index 06ecf1a..06ecf1a 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
index 39c1900..39c1900 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
index fa4ab4f..fa4ab4f 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
index 30aa8ad..30aa8ad 100644
--- a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+++ b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
index 62ea1cc..62ea1cc 100644
--- a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
index f5c4736..f5c4736 100644
--- a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
index 54c873c..54c873c 100644
--- a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
index b87a17d..b87a17d 100644
--- a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
index a7ff71d..a7ff71d 100644
--- a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst
+++ b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
index 7206ae9..7206ae9 100644
--- a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
index 83db344..83db344 100644
--- a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
index a5eb497..a5eb497 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
index 6673d39..6673d39 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst
+++ b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
index 7ba3308..7ba3308 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
index 30f8f1b..30f8f1b 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
index 9a9a9aa..9a9a9aa 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
index d5a5902..d5a5902 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst
+++ b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
index 5b3c740..5b3c740 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
index 65d35ef..65d35ef 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
index 3f02ff2..3f02ff2 100644
--- a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
index ccf4f7b..ccf4f7b 100644
--- a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst
+++ b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
index c52e34d..c52e34d 100644
--- a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
index 6787784..6787784 100644
--- a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
index b0cd32d..b0cd32d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
index 27c33d7..27c33d7 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst
+++ b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
index fa4e12d..fa4e12d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
index de58ef2..de58ef2 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 9b58965..f3b8d3e 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -56,17 +56,17 @@ 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_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=./testpack
 test -d $TESTDIR || mkdir $TESTDIR
@@ -127,62 +127,62 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-17432.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-14460.h5
 ########tools/testfiles#for#external#links########
-$SRC_TOOLS_TESTFILES/tsoftlinks.h5
-$SRC_TOOLS_TESTFILES/textlinkfar.h5
-$SRC_TOOLS_TESTFILES/textlinksrc.h5
-$SRC_TOOLS_TESTFILES/textlinktar.h5
-$SRC_TOOLS_TESTFILES/textlink.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_trg.h5
+$SRC_H5DUMP_TESTFILES/tsoftlinks.h5
+$SRC_H5DUMP_TESTFILES/textlinkfar.h5
+$SRC_H5DUMP_TESTFILES/textlinksrc.h5
+$SRC_H5DUMP_TESTFILES/textlinktar.h5
+$SRC_H5DUMP_TESTFILES/textlink.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_src.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tfamily00000.h5
-$SRC_TOOLS_TESTFILES/tfamily00001.h5
-$SRC_TOOLS_TESTFILES/tfamily00002.h5
-$SRC_TOOLS_TESTFILES/tfamily00003.h5
-$SRC_TOOLS_TESTFILES/tfamily00004.h5
-$SRC_TOOLS_TESTFILES/tfamily00005.h5
-$SRC_TOOLS_TESTFILES/tfamily00006.h5
-$SRC_TOOLS_TESTFILES/tfamily00007.h5
-$SRC_TOOLS_TESTFILES/tfamily00008.h5
-$SRC_TOOLS_TESTFILES/tfamily00009.h5
-$SRC_TOOLS_TESTFILES/tfamily00010.h5
-$SRC_TOOLS_TESTFILES/tordergr.h5
+$SRC_H5DUMP_TESTFILES/tfamily00000.h5
+$SRC_H5DUMP_TESTFILES/tfamily00001.h5
+$SRC_H5DUMP_TESTFILES/tfamily00002.h5
+$SRC_H5DUMP_TESTFILES/tfamily00003.h5
+$SRC_H5DUMP_TESTFILES/tfamily00004.h5
+$SRC_H5DUMP_TESTFILES/tfamily00005.h5
+$SRC_H5DUMP_TESTFILES/tfamily00006.h5
+$SRC_H5DUMP_TESTFILES/tfamily00007.h5
+$SRC_H5DUMP_TESTFILES/tfamily00008.h5
+$SRC_H5DUMP_TESTFILES/tfamily00009.h5
+$SRC_H5DUMP_TESTFILES/tfamily00010.h5
+$SRC_H5DUMP_TESTFILES/tordergr.h5
 ########reference#conversion#files########
 ########tools/testfiles/vds########
-$SRC_TOOLS_TESTFILES/vds/1_a.h5
-$SRC_TOOLS_TESTFILES/vds/1_b.h5
-$SRC_TOOLS_TESTFILES/vds/1_c.h5
-$SRC_TOOLS_TESTFILES/vds/1_d.h5
-$SRC_TOOLS_TESTFILES/vds/1_e.h5
-$SRC_TOOLS_TESTFILES/vds/1_f.h5
-$SRC_TOOLS_TESTFILES/vds/1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/2_a.h5
-$SRC_TOOLS_TESTFILES/vds/2_b.h5
-$SRC_TOOLS_TESTFILES/vds/2_c.h5
-$SRC_TOOLS_TESTFILES/vds/2_d.h5
-$SRC_TOOLS_TESTFILES/vds/2_e.h5
-$SRC_TOOLS_TESTFILES/vds/2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/4_0.h5
-$SRC_TOOLS_TESTFILES/vds/4_1.h5
-$SRC_TOOLS_TESTFILES/vds/4_2.h5
-$SRC_TOOLS_TESTFILES/vds/4_vds.h5
-$SRC_TOOLS_TESTFILES/vds/5_a.h5
-$SRC_TOOLS_TESTFILES/vds/5_b.h5
-$SRC_TOOLS_TESTFILES/vds/5_c.h5
-$SRC_TOOLS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5.onion
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5REPACK_TESTFILES/h5repack-help.txt
+$SRC_H5REPACK_OUTFILES/h5repack-help.txt
 $SRC_H5REPACK_TESTFILES/h5repack_ext.bin
 $SRC_H5REPACK_TESTFILES/ublock.bin
 $SRC_H5REPACK_TESTFILES/h5repack.info
@@ -197,66 +197,66 @@ $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-1.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-2.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-3.dat
 ###############
-$SRC_H5REPACK_TESTFILES/crtorder.tordergr.h5.ddl
-$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/crtorder.tordergr.h5.ddl
+$SRC_H5REPACK_OUTFILES/deflate_limit.h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
 ########fsm#files########
-$SRC_H5REPACK_TESTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/STG.h5repack_none.h5.ddl
-$SRC_H5REPACK_TESTFILES/GS.h5repack_paged_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SP.h5repack_paged_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SPT.h5repack_aggr.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/STG.h5repack_none.h5.ddl
+$SRC_H5REPACK_OUTFILES/GS.h5repack_paged_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_paged_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SPT.h5repack_aggr.h5.ddl
 ########vds#files########
-$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
-$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
-$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl
+$SRC_H5REPACK_OUTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+$SRC_H5REPACK_OUTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
+$SRC_H5REPACK_OUTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_compa-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_conti-v.ddl
 ########refs#files########
-$SRC_H5REPACK_TESTFILES/attrregion.tattrreg.h5.ddl
-$SRC_H5REPACK_TESTFILES/dataregion.tdatareg.h5.ddl
+$SRC_H5REPACK_OUTFILES/attrregion.tattrreg.h5.ddl
+$SRC_H5REPACK_OUTFILES/dataregion.tdatareg.h5.ddl
 ########external#links#files########
-$SRC_H5REPACK_TESTFILES/textlinkfar-base.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-base.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-base.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-base.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-prune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-prune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-prune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-prune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-mergeprune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-base.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-base.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-base.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-base.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-prune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-prune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-prune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-prune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-mergeprune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
 ########tst#files########
-$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
 ########external#links#tst#files########
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
 ########onion#files########
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_1d.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_ext.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_objs.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_1d.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_ext.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_objs.h5.ddl
 "
 
 #
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index bd7c3a1..43be1ee 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -47,6 +47,7 @@ SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -62,14 +63,14 @@ test -d $TESTDIR || mkdir $TESTDIR
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
 $SRC_H5REPACK_TESTFILES/h5repack_layout.h5
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_version_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_version_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_version_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_version_test.h5repack_layout.h5.tst
 "
 #$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5
-#$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5-plugin_none.ddl
-#$SRC_H5REPACK_TESTFILES/plugin_none.h5repack_layout.UD.h5.tst
+#$SRC_H5REPACK_OUTFILES/h5repack_layout.UD.h5-plugin_none.ddl
+#$SRC_H5REPACK_OUTFILES/plugin_none.h5repack_layout.UD.h5.tst
 #"
 
 #
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
deleted file mode 100644
index 7b8621e..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
+++ /dev/null
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
deleted file mode 100644
index 3a0242d..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
+++ /dev/null