Split tools into src and test - add folders

53 files changed, 11820 insertions, 0 deletions

diff --git a/tools/test/h5repack/CMakeLists.txt b/tools/test/h5repack/CMakeLists.txt
new file mode 100644
index 0000000..cecec53
--- /dev/null
+++ b/tools/test/h5repack/CMakeLists.txt
@@ -0,0 +1,79 @@
+cmake_minimum_required (VERSION 3.1.0)
+PROJECT (HDF5_TOOLS_TEST_H5REPACK)
+
+#-----------------------------------------------------------------------------
+# Setup include Directories
+#-----------------------------------------------------------------------------
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/lib)
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_DIR}/src/h5repack)
+INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
+
+# --------------------------------------------------------------------
+# Add h5Repack test executables
+# --------------------------------------------------------------------
+add_executable (testh5repack_detect_szip ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testh5repack_detect_szip.c)
+TARGET_NAMING (testh5repack_detect_szip STATIC)
+TARGET_C_PROPERTIES (testh5repack_detect_szip STATIC " " " ")
+target_link_libraries (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+set_target_properties (testh5repack_detect_szip PROPERTIES FOLDER tools)
+
+set (REPACK_COMMON_SOURCES
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_copy.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_filters.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_opttable.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_parse.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_refs.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack_verify.c
+    ${HDF5_TOOLS_SRC_H5REPACK_SOURCE_DIR}/h5repack.c
+)
+add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/h5repacktst.c)
+TARGET_NAMING (h5repacktest STATIC)
+TARGET_C_PROPERTIES (h5repacktest STATIC " " " ")
+target_link_libraries (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+set_target_properties (h5repacktest PROPERTIES FOLDER tools)
+
+  #-----------------------------------------------------------------------------
+  # If plugin library tests can be tested
+  #-----------------------------------------------------------------------------
+  set (HDF5_TOOL_PLUGIN_LIB_CORENAME         "dynlibadd")
+  set (HDF5_TOOL_PLUGIN_LIB_NAME             "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOL_PLUGIN_LIB_CORENAME}")
+  set (HDF5_TOOL_PLUGIN_LIB_TARGET           ${HDF5_TOOL_PLUGIN_LIB_CORENAME})
+  set (HDF5_TOOL_PLUGIN_LIB_VCORENAME        "dynlibvers")
+  set (HDF5_TOOL_PLUGIN_LIB_VNAME            "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_TOOL_PLUGIN_LIB_VCORENAME}")
+  set (HDF5_TOOL_PLUGIN_LIB_VTARGET          ${HDF5_TOOL_PLUGIN_LIB_VCORENAME})
+  add_definitions (${HDF_EXTRA_C_FLAGS})
+  INCLUDE_DIRECTORIES (${HDF5_SRC_DIR})
+
+  add_library (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED dynlib_rpk.c)
+  TARGET_C_PROPERTIES (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED " " " ")
+  target_link_libraries (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  H5_SET_LIB_OPTIONS (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TOOL_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
+
+  add_library (${HDF5_TOOL_PLUGIN_LIB_VTARGET} SHARED dynlib_vrpk.c)
+  TARGET_C_PROPERTIES (${HDF5_TOOL_PLUGIN_LIB_VTARGET} SHARED " " " ")
+  target_link_libraries (${HDF5_TOOL_PLUGIN_LIB_VTARGET} ${HDF5_TEST_LIB_TARGET})
+  H5_SET_LIB_OPTIONS (${HDF5_TOOL_PLUGIN_LIB_VTARGET} ${HDF5_TOOL_PLUGIN_LIB_VNAME} SHARED ${HDF5_PACKAGE_SOVERSION})
+
+  # make plugins dir
+  file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugins")
+  #-----------------------------------------------------------------------------
+  # Copy plugin library to a plugins folder
+  #-----------------------------------------------------------------------------
+  add_custom_command (
+      TARGET     ${HDF5_TOOL_PLUGIN_LIB_TARGET}
+      POST_BUILD
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different
+          "$<TARGET_FILE:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
+          "${CMAKE_BINARY_DIR}/plugins/$<TARGET_FILE_NAME:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
+  )
+  add_custom_command (
+      TARGET     ${HDF5_TOOL_PLUGIN_LIB_VTARGET}
+      POST_BUILD
+      COMMAND    ${CMAKE_COMMAND}
+      ARGS       -E copy_if_different
+          "$<TARGET_FILE:${HDF5_TOOL_PLUGIN_LIB_VTARGET}>"
+          "${CMAKE_BINARY_DIR}/plugins/$<TARGET_FILE_NAME:${HDF5_TOOL_PLUGIN_LIB_VTARGET}>"
+  )
+
+  include (CMakeTests.cmake)
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
new file mode 100644
index 0000000..f3ef2a5
--- /dev/null
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -0,0 +1,1153 @@
+
+##############################################################################
+##############################################################################
+###           T E S T I N G                                                ###
+##############################################################################
+##############################################################################
+
+  if (HDF5_TEST_VFD)
+    set (VFD_LIST
+        sec2
+        stdio
+        core
+        split
+        multi
+        family
+    )
+
+    if (DIRECT_VFD)
+      set (VFD_LIST ${VFD_LIST} direct)
+    endif (DIRECT_VFD)
+
+    MACRO (ADD_VFD_TEST vfdname resultcode)
+      add_test (
+        NAME H5REPACK-VFD-${vfdname}-h5repacktest
+        COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_PROGRAM=$<TARGET_FILE:h5repacktest>"
+            -D "TEST_ARGS:STRING="
+            -D "TEST_VFD:STRING=${vfdname}"
+            -D "TEST_EXPECT=${resultcode}"
+            -D "TEST_OUTPUT=h5repacktest"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+            -P "${HDF_RESOURCES_DIR}/vfdTest.cmake"
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK-VFD-${vfdname}-h5repacktest PROPERTIES DEPENDS ${last_test})
+      endif (NOT "${last_test}" STREQUAL "")
+      set (last_test "H5REPACK-VFD-${vfdname}-h5repacktest")
+    ENDMACRO (ADD_VFD_TEST)
+  endif (HDF5_TEST_VFD)
+
+  # --------------------------------------------------------------------
+  # 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/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_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_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_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
+      # h5diff/testfile
+      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.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
+      # 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
+  )
+
+  set (LIST_OTHER_TEST_FILES
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack-help.txt
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.bin
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/ublock.bin
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack.info
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5.tst
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5.tst
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v.ddl
+      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero.tst
+  )
+
+  foreach (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
+    get_filename_component(fname "${h5_file}" NAME)
+    HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files")
+  endforeach (h5_file ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
+  add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list})
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S  M A C R O S                               ###
+##############################################################################
+##############################################################################
+
+  MACRO (ADD_HELP_TEST testname resultcode)
+    # If using memchecker add tests without using scripts
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5REPACK-${testname} COMMAND $<TARGET_FILE:h5repack> ${ARGN})
+      set_tests_properties (H5REPACK-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      set (last_test "H5REPACK-${testname}")
+    else (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5REPACK-h5repack-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+              -D "TEST_ARGS:STRING=${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=h5repack-${testname}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=h5repack-${testname}.txt"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+    endif (HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_HELP_TEST)
+
+  MACRO (ADD_H5_TEST_OLD testname testtype testfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_OLD-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      add_test (
+          NAME H5REPACK_OLD-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} -i ${PROJECT_BINARY_DIR}/testfiles/${testfile} -o ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_OLD-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5REPACK_OLD-${testname}_DFF
+          COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK_OLD-${testname}_DFF PROPERTIES DEPENDS H5REPACK_OLD-${testname})
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_TEST_OLD)
+
+  MACRO (ADD_H5_TEST testname testtype testfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      add_test (
+          NAME H5REPACK-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5REPACK-${testname}_DFF
+          COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+      )
+      set_tests_properties (H5REPACK-${testname}_DFF PROPERTIES DEPENDS H5REPACK-${testname})
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_TEST)
+
+  MACRO (ADD_H5_CMP_TEST testname testfilter testtype resultcode resultfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_CMP-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      # If using memchecker add tests without using scripts
+      if (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_CMP-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
+      else (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_CMP-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_FILTER:STRING=${testfilter}"
+                -D "TEST_REFERENCE=${resultfile}-${testname}.tst"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif (HDF5_ENABLE_USING_MEMCHECKER)
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_CMP_TEST)
+
+  MACRO (ADD_H5_MASK_TEST testname testtype resultcode resultfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      # If using memchecker add tests without using scripts
+      if (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
+      else (HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_MASK-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+                -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_MASK_ERROR=true"
+                -D "TEST_REFERENCE=${resultfile}-${testname}.tst"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+      endif (HDF5_ENABLE_USING_MEMCHECKER)
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_MASK-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_MASK_TEST)
+
+  MACRO (ADD_H5_DMP_TEST testname testtype resultcode resultfile)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_DMP-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      # If using memchecker add tests without using scripts
+      add_test (
+          NAME H5REPACK_DMP-${testname}
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${resultfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile})
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_DMP-${testname} PROPERTIES DEPENDS ${last_test})
+      endif ()
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_DMP-h5dump-${testname}
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                -D "TEST_ARGS:STRING=-pH;out-${testname}.${resultfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${testname}.${resultfile}.ddl"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+        set_tests_properties (H5REPACK_DMP-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_DMP-${testname}")
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_DMP_TEST)
+
+  MACRO (ADD_H5_VERIFY_TEST testname testtype resultcode testfile testdset testfilter)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname} PROPERTIES DEPENDS ${last_test})
+        endif ()
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT-${testname}_DFF
+            COMMAND $<TARGET_FILE:h5diff> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DFF PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname})
+        if ("${resultcode}" STREQUAL "0")
+          add_test (
+              NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
+              COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                  -D "TEST_ARGS:STRING=-d;${testdset};-pH;out-${testname}.${testfile}"
+                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                  -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
+                  -D "TEST_EXPECT=${resultcode}"
+                  -D "TEST_FILTER:STRING=${testfilter}"
+                  -D "TEST_REFERENCE=${testfilter}"
+                  -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
+          )
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
+        else ("${resultcode}" STREQUAL "0")
+          if ("${testfilter}" STREQUAL "CHUNKED")
+            set (nottestfilter "(CONTIGUOUS|COMPACT)")
+          endif ()
+          if ("${testfilter}" STREQUAL "CONTIGUOUS")
+            set (nottestfilter "(CHUNK|COMPACT)")
+          endif ()
+          if ("${testfilter}" STREQUAL "COMPACT")
+            set (nottestfilter "(CONTIGUOUS|CHUNK)")
+          endif ()
+          add_test (
+              NAME H5REPACK_VERIFY_LAYOUT-${testname}_DMP
+              COMMAND "${CMAKE_COMMAND}"
+                  -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                  -D "TEST_ARGS:STRING=-pH;out-${testname}.${testfile}"
+                  -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                  -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
+                  -D "TEST_EXPECT=${resultcode}"
+                  -D "TEST_FILTER:STRING=${nottestfilter}"
+                  -D "TEST_REFERENCE=${testfilter}"
+                  -P "${HDF_RESOURCES_EXT_DIR}/grepTest.cmake"
+          )
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT-${testname}_DFF)
+        endif ("${resultcode}" STREQUAL "0")
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_VERIFY_TEST)
+
+  MACRO (ADD_H5_VERIFY_VDS testname testtype resultcode testfile testdset testfilter)
+    if ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}-SKIPPED
+            COMMAND ${CMAKE_COMMAND} -E echo "SKIP -d ${testdset} -pH ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${resultfile}"
+        )
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    else ("${testtype}" STREQUAL "SKIP")
+      if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}
+            COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}.${testfile}
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+        if (NOT "${last_test}" STREQUAL "")
+          set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname} PROPERTIES DEPENDS ${last_test})
+        endif ()
+        add_test (
+            NAME H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP
+            COMMAND "${CMAKE_COMMAND}"
+                -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+                -D "TEST_ARGS:STRING=-d;${testdset};-p;out-${testname}.${testfile}"
+                -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+                -D "TEST_OUTPUT=${testfile}-${testname}-v.out"
+                -D "TEST_EXPECT=${resultcode}"
+                -D "TEST_REFERENCE=${testfile}-${testname}-v.ddl"
+                -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+        )
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
+        set_tests_properties (H5REPACK_VERIFY_LAYOUT_VDS-${testname}_DMP PROPERTIES DEPENDS H5REPACK_VERIFY_LAYOUT_VDS-${testname})
+      endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+    endif ("${testtype}" STREQUAL "SKIP")
+  ENDMACRO (ADD_H5_VERIFY_VDS)
+
+  MACRO (ADD_H5_TEST_META testname testfile)
+      add_test (
+          NAME H5REPACK_META-${testname}_N
+          COMMAND $<TARGET_FILE:h5repack> ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5
+      )
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (H5REPACK_META-${testname}_N PROPERTIES DEPENDS ${last_test})
+      endif ()
+      add_test (
+          NAME H5REPACK_META-${testname}_M
+          COMMAND $<TARGET_FILE:h5repack> ${ARGN} ${PROJECT_BINARY_DIR}/testfiles/${testfile} ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5
+      )
+      set_tests_properties (H5REPACK_META-${testname}_M PROPERTIES DEPENDS H5REPACK_META-${testname}_N)
+
+      add_test (NAME H5REPACK_META-${testname} COMMAND ${CMAKE_COMMAND} -E compare_files ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_N.${testname}.h5 ${PROJECT_BINARY_DIR}/testfiles/out-${testname}_M.${testname}.h5)
+      set_tests_properties (H5REPACK_META-${testname} PROPERTIES WILL_FAIL "true")
+      set_tests_properties (H5REPACK_META-${testname} PROPERTIES DEPENDS H5REPACK_META-${testname}_M)
+  ENDMACRO (ADD_H5_TEST_META)
+
+  MACRO (ADD_H5_UD_TEST testname resultcode resultfile)
+    if (NOT HDF5_ENABLE_USING_MEMCHECKER)
+      # Remove any output file left over from previous test run
+      add_test (
+          NAME H5REPACK_UD-${testname}-clearall-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              testfiles/out-${testname}.${resultfile}
+      )
+      add_test (
+          NAME H5REPACK_UD-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>"
+              -D "TEST_ARGS:STRING=${ARGN};${resultfile};out-${testname}.${resultfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_FILTER:STRING=O?...ing file[^\n]+\n"
+              -D "TEST_OUTPUT=${testname}.${resultfile}.out"
+              -D "TEST_REFERENCE=${testname}.${resultfile}.tst"
+              -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+              -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5REPACK_UD-${testname} PROPERTIES DEPENDS H5REPACK_UD-${testname}-clearall-objects)
+      add_test (
+          NAME H5REPACK_UD-h5dump-${testname}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=-pH;out-${testname}.${resultfile}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles"
+              -D "TEST_OUTPUT=${resultfile}-${testname}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}-${testname}.ddl"
+              -D "TEST_ENV_VAR=HDF5_PLUGIN_PATH"
+              -D "TEST_ENV_VALUE=${CMAKE_BINARY_DIR}/plugins"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5REPACK_UD-h5dump-${testname} PROPERTIES DEPENDS "H5REPACK_UD-${testname}")
+    endif (NOT HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_UD_TEST)
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S                                            ###
+##############################################################################
+##############################################################################
+
+  # --------------------------------------------------------------------
+  # test file names
+  # --------------------------------------------------------------------
+  set (INFO_FILE testfiles/h5repack.info)
+
+  set (FILE0 h5repack_fill.h5)
+  set (FILE1 h5repack_objs.h5)
+  set (FILE2 h5repack_attr.h5)
+  set (FILE3 h5repack_hlink.h5)
+  set (FILE4 h5repack_layout.h5)
+  set (FILE5 h5repack_early.h5)
+  set (FILE7 h5repack_szip.h5)
+  set (FILE8 h5repack_deflate.h5)
+  set (FILE9 h5repack_shuffle.h5)
+  set (FILE10 h5repack_fletcher.h5)
+  set (FILE11 h5repack_filters.h5)
+  set (FILE12 h5repack_nbit.h5)
+  set (FILE13 h5repack_soffset.h5)
+  set (FILE14 h5repack_layouto.h5 )     # A file with an older version of the layout message (copy of test/tlayouto.h5)
+  set (FILE15 h5repack_named_dtypes.h5)
+  set (FILE16 tfamily%05d.h5)           # located in common testfiles folder
+  set (FILE18 h5repack_layout2.h5)
+  set (FILE_REF h5repack_refs.h5)
+  set (FILE_ATTR_REF h5repack_attr_refs.h5)
+  set (FILEV1 1_vds.h5)
+  set (FILEV2 2_vds.h5)
+  set (FILEV3_1 3_1_vds.h5)
+  set (FILEV3_2 3_2_vds.h5)
+  set (FILEV4 4_vds.h5)
+  set (FILEV5 5_vds.h5)
+
+  # Remove any output file left over from previous test run
+  add_test (
+      NAME H5REPACK-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove
+         ./testfiles/h5dump-help.out
+         ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out
+         ./testfiles/h5repack_filters.h5-gzip_verbose_filters.out.err
+         ./testfiles/h5repack_layout.h5-chunk_18x13-v.out
+         ./testfiles/h5repack_layout.h5-chunk_18x13-v.out.err
+         ./testfiles/h5repack_layout.h5-chunk_20x10-v.out
+         ./testfiles/h5repack_layout.h5-chunk_20x10-v.out.err
+         ./testfiles/h5repack_layout.h5-chunk_compa-v.out
+         ./testfiles/h5repack_layout.h5-chunk_compa-v.out.err
+         ./testfiles/h5repack_layout.h5-chunk_conti-v.out
+         ./testfiles/h5repack_layout.h5-chunk_conti-v.out.err
+         ./testfiles/h5repack_layout.h5-compa-v.out
+         ./testfiles/h5repack_layout.h5-compa-v.out.err
+         ./testfiles/h5repack_layout.h5-conti-v.out
+         ./testfiles/h5repack_layout.h5-conti-v.out.err
+         ./testfiles/h5repack_layout.h5-deflate_limit.out
+         ./testfiles/h5repack_layout.h5-deflate_limit.out.err
+         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out
+         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-v.out.err
+         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.out
+         ./testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.out.err
+         ./testfiles/h5repack_layout.h5-dset2_compa-v.out
+         ./testfiles/h5repack_layout.h5-dset2_compa-v.out.err
+         ./testfiles/h5repack_layout.h5-dset2_conti-v.out
+         ./testfiles/h5repack_layout.h5-dset2_conti-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_compa_chunk-v.out
+         ./testfiles/h5repack_layout.h5-dset_compa_chunk-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_compa_compa-v.out
+         ./testfiles/h5repack_layout.h5-dset_compa_compa-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_compa_conti-v.out
+         ./testfiles/h5repack_layout.h5-dset_compa_conti-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_conti_chunk-v.out
+         ./testfiles/h5repack_layout.h5-dset_conti_chunk-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_conti_compa-v.out
+         ./testfiles/h5repack_layout.h5-dset_conti_compa-v.out.err
+         ./testfiles/h5repack_layout.h5-dset_conti_conti-v.out
+         ./testfiles/h5repack_layout.h5-dset_conti_conti-v.out.err
+         ./testfiles/h5repack_layout.h5-layout_long_switches-v.out
+         ./testfiles/h5repack_layout.h5-layout_long_switches-v.out.err
+         ./testfiles/h5repack_layout.h5-layout_short_switches-v.out
+         ./testfiles/h5repack_layout.h5-layout_short_switches-v.out.err
+         ./testfiles/h5repack_layout.h5-plugin_test.out
+         ./testfiles/h5repack_layout.h5-plugin_test.out.err
+         ./testfiles/h5repack_layout2.h5-contig_small_compa-v.out
+         ./testfiles/h5repack_layout2.h5-contig_small_compa-v.out.err
+         ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out
+         ./testfiles/h5repack_layout2.h5-contig_small_fixed_compa-v.out.err
+         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out
+         ./testfiles/h5repack_layout3.h5-ckdim_biger-v.out.err
+         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out
+         ./testfiles/h5repack_layout3.h5-ckdim_smaller-v.out.err
+         ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out
+         ./testfiles/h5repack_layout3.h5-chunk2chunk-v.out.err
+         ./testfiles/h5repack_layout3.h5-chunk2compa-v.out
+         ./testfiles/h5repack_layout3.h5-chunk2compa-v.out.err
+         ./testfiles/h5repack_layout3.h5-chunk2conti-v.out
+         ./testfiles/h5repack_layout3.h5-chunk2conti-v.out.err
+         ./testfiles/h5repack_layout3.h5-error1-v.out
+         ./testfiles/h5repack_layout3.h5-error1-v.out.err
+         ./testfiles/h5repack_layout3.h5-error2-v.out
+         ./testfiles/h5repack_layout3.h5-error2-v.out.err
+         ./testfiles/h5repack_layout3.h5-error3-v.out
+         ./testfiles/h5repack_layout3.h5-error3-v.out.err
+         ./testfiles/out-family.tfamily%05d.h5
+         ./testfiles/out-HDFFV-7840.h5diff_attr1.h5
+         ./testfiles/out-attr.h5repack_attr.h5
+         ./testfiles/out-native_attr.h5repack_attr.h5
+         ./testfiles/out-HDFFV-5932.h5repack_attr_refs.h5
+         ./testfiles/out-deflate_copy.h5repack_deflate.h5
+         ./testfiles/out-deflate_remove.h5repack_deflate.h5
+         ./testfiles/out-early.h5repack_early.h5
+         ./testfiles/out-fill.h5repack_fill.h5
+         ./testfiles/out-native_fill.h5repack_fill.h5
+         ./testfiles/out-gzip_verbose_filters.h5repack_filters.h5
+         ./testfiles/out-fletcher_copy.h5repack_fletcher.h5
+         ./testfiles/out-fletcher_remove.h5repack_fletcher.h5
+         ./testfiles/out-hlink.h5repack_hlink.h5
+         ./testfiles/out-chunk_18x13.h5repack_layout.h5
+         ./testfiles/out-chunk_20x10.h5repack_layout.h5
+         ./testfiles/out-chunk_compa.h5repack_layout.h5
+         ./testfiles/out-chunk_conti.h5repack_layout.h5
+         ./testfiles/out-compa.h5repack_layout.h5
+         ./testfiles/out-conti.h5repack_layout.h5
+         ./testfiles/out-deflate_file.h5repack_layout.h5
+         ./testfiles/out-deflate_limit.h5repack_layout.h5
+         ./testfiles/out-dset2_chunk_20x10.h5repack_layout.h5
+         ./testfiles/out-dset2_compa.h5repack_layout.h5
+         ./testfiles/out-dset2_conti.h5repack_layout.h5
+         ./testfiles/out-dset_compa_chunk.h5repack_layout.h5
+         ./testfiles/out-dset_compa_compa.h5repack_layout.h5
+         ./testfiles/out-dset_compa_conti.h5repack_layout.h5
+         ./testfiles/out-dset_conti_chunk.h5repack_layout.h5
+         ./testfiles/out-dset_conti_compa.h5repack_layout.h5
+         ./testfiles/out-dset_conti_conti.h5repack_layout.h5
+         ./testfiles/out-fletcher_all.h5repack_layout.h5
+         ./testfiles/out-fletcher_individual.h5repack_layout.h5
+         ./testfiles/out-global_filters.h5repack_layout.h5
+         ./testfiles/out-gzip_all.h5repack_layout.h5
+         ./testfiles/out-gzip_individual.h5repack_layout.h5
+         ./testfiles/out-layout.h5repack_layout.h5
+         ./testfiles/out-layout_long_switches.h5repack_layout.h5
+         ./testfiles/out-layout_short_switches.h5repack_layout.h5
+         ./testfiles/out-old_style_layout_short_switches.h5repack_layout.h5
+         ./testfiles/out-plugin_test.h5repack_layout.h5
+         ./testfiles/out-shuffle_all.h5repack_layout.h5
+         ./testfiles/out-shuffle_individual.h5repack_layout.h5
+         ./testfiles/out-upgrade_layout.h5repack_layouto.h5
+         ./testfiles/out-contig_small_compa.h5repack_layout2.h5
+         ./testfiles/out-contig_small_fixed_compa.h5repack_layout2.h5
+         ./testfiles/out-ckdim_biger.h5repack_layout3.h5
+         ./testfiles/out-ckdim_smaller.h5repack_layout3.h5
+         ./testfiles/out-chunk2chunk.h5repack_layout3.h5
+         ./testfiles/out-chunk2compa.h5repack_layout3.h5
+         ./testfiles/out-chunk2conti.h5repack_layout3.h5
+         ./testfiles/out-error1.h5repack_layout3.h5
+         ./testfiles/out-error2.h5repack_layout3.h5
+         ./testfiles/out-error3.h5repack_layout3.h5
+         ./testfiles/out-error4.h5repack_layout3.h5
+         ./testfiles/out-committed_dt.h5repack_named_dtypes.h5
+         ./testfiles/out-nbit_add.h5repack_nbit.h5
+         ./testfiles/out-nbit_copy.h5repack_nbit.h5
+         ./testfiles/out-nbit_remove.h5repack_nbit.h5
+         ./testfiles/out-add_alignment.h5repack_objs.h5
+         ./testfiles/out-add_userblock.h5repack_objs.h5
+         ./testfiles/out-objs.h5repack_objs.h5
+         ./testfiles/out-gt_mallocsize.h5repack_objs.h5
+         ./testfiles/out-bug1814.h5repack_refs.h5
+         ./testfiles/out-shuffle_copy.h5repack_shuffle.h5
+         ./testfiles/out-shuffle_remove.h5repack_shuffle.h5
+         ./testfiles/out-scale_add.h5repack_soffset.h5
+         ./testfiles/out-scale_copy.h5repack_soffset.h5
+         ./testfiles/out-scale_remove.h5repack_soffset.h5
+         ./testfiles/out-meta_short_M.meta_short.h5
+         ./testfiles/out-meta_short_N.meta_short.h5
+         ./testfiles/out-meta_long_M.meta_long.h5
+         ./testfiles/out-meta_long_N.meta_long.h5
+         ./testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.out
+         ./testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.out.err
+         ./testfiles/2_vds.h5-vds_chunk3x6x9-v.out
+         ./testfiles/2_vds.h5-vds_chunk3x6x9-v.out.err
+         ./testfiles/3_1_vds.h5-vds_chunk2x5x8-v.out
+         ./testfiles/3_1_vds.h5-vds_chunk2x5x8-v.out.err
+         ./testfiles/4_vds.h5-vds_compa-v.out
+         ./testfiles/4_vds.h5-vds_compa-v.out.err
+         ./testfiles/4_vds.h5-vds_conti-v.out
+         ./testfiles/4_vds.h5-vds_conti-v.out.err
+         ./testfiles/out-vds_compa.4_vds.h5
+         ./testfiles/out-vds_conti.4_vds.h5
+         ./testfiles/out-vds_chunk2x5x8.3_1_vds.h5
+         ./testfiles/out-vds_chunk3x6x9.2_vds.h5
+         ./testfiles/out-vds_dset_chunk20x10x5.1_vds.h5
+         h5repack_attr.h5
+         h5repack_attr_out.h5
+         h5repack_attr_refs.h5
+         h5repack_big.h5
+         h5repack_deflate.h5
+         h5repack_deflate_out.h5
+         h5repack_early2.h5
+         h5repack_early.h5
+         h5repack_early_out.h5
+         h5repack_ext.h5
+         h5repack_ext_out.h5
+         h5repack_fill.h5
+         h5repack_fill_out.h5
+         h5repack_filters.h5
+         h5repack_filters_out.h5
+         h5repack_fletcher.h5
+         h5repack_fletcher_out.h5
+         h5repack_hlink.h5
+         h5repack_hlink_out.h5
+         h5repack_layout.h5
+         h5repack_layout_out.h5
+         h5repack_layout2.h5
+         h5repack_layout3.h5
+         h5repack_named_dtypes.h5
+         h5repack_named_dtypes_out.h5
+         h5repack_nbit.h5
+         h5repack_nbit_out.h5
+         h5repack_objs.h5
+         h5repack_objs_out.h5
+         h5repack_refs.h5
+         h5repack_shuffle.h5
+         h5repack_shuffle_out.h5
+         h5repack_soffset.h5
+         h5repack_soffset_out.h5
+         h5repack_szip.h5
+         h5repack_szip_out.h5
+         h5repack_ub.h5
+         h5repack_ub_out.h5
+         h5repack_ext.bin
+         ublock.bin
+  )
+  if (NOT "${last_test}" STREQUAL "")
+    set_tests_properties (H5REPACK-clearall-objects PROPERTIES DEPENDS ${last_test})
+  endif (NOT "${last_test}" STREQUAL "")
+
+  ADD_HELP_TEST(help 0 -h)
+
+  add_test (NAME H5REPACK-testh5repack_detect_szip COMMAND $<TARGET_FILE:testh5repack_detect_szip>)
+  if (HDF5_ENABLE_SZIP_SUPPORT)
+    if (HDF5_ENABLE_SZIP_ENCODING)
+      set (passRegex "yes")
+      set_tests_properties (H5REPACK-testh5repack_detect_szip PROPERTIES PASS_REGULAR_EXPRESSION "yes")
+    else (HDF5_ENABLE_SZIP_ENCODING)
+      set (passRegex "no")
+      set_tests_properties (H5REPACK-testh5repack_detect_szip PROPERTIES PASS_REGULAR_EXPRESSION "no")
+    endif (HDF5_ENABLE_SZIP_ENCODING)
+  else (HDF5_ENABLE_SZIP_SUPPORT)
+    set (passRegex "no")
+    set_tests_properties (H5REPACK-testh5repack_detect_szip PROPERTIES PASS_REGULAR_EXPRESSION "no")
+  endif (HDF5_ENABLE_SZIP_SUPPORT)
+  set_tests_properties (H5REPACK-testh5repack_detect_szip PROPERTIES DEPENDS H5REPACK-clearall-objects)
+
+  add_test (NAME H5REPACK-h5repacktest COMMAND $<TARGET_FILE:h5repacktest>)
+  set_tests_properties (H5REPACK-h5repacktest PROPERTIES DEPENDS H5REPACK-testh5repack_detect_szip)
+  set (last_test "H5REPACK-h5repacktest")
+
+#
+# The tests
+# We use the files generated by h5repacktst
+# Each run generates "<file>.out.h5" and the tool h5diff is used to
+# compare the input and output files
+#
+# the tests are the same as the program h5repacktst, but run from the CLI
+#
+
+# See which filters are usable (and skip tests for filters we
+# don't have).  Do this by searching H5pubconf.h to see which
+# filters are defined.
+
+# detect whether the encoder is present.
+  set (USE_FILTER_SZIP_ENCODER "no")
+  if (HDF5_ENABLE_SZIP_ENCODING)
+    set (USE_FILTER_SZIP_ENCODER ${testh5repack_detect_szip})
+  endif (HDF5_ENABLE_SZIP_ENCODING)
+
+  if (H5_HAVE_FILTER_DEFLATE)
+    set (USE_FILTER_DEFLATE "true")
+  endif (H5_HAVE_FILTER_DEFLATE)
+
+  if (H5_HAVE_FILTER_SZIP)
+    set (USE_FILTER_SZIP "true")
+  endif (H5_HAVE_FILTER_SZIP)
+
+# copy files (these files have no filters)
+  ADD_H5_TEST (fill "TEST" ${FILE0})
+  ADD_H5_TEST (objs "TEST" ${FILE1})
+  ADD_H5_TEST (attr "TEST" ${FILE2})
+  ADD_H5_TEST (hlink "TEST" ${FILE3})
+  ADD_H5_TEST (layout "TEST" ${FILE4})
+  ADD_H5_TEST (early "TEST" ${FILE5})
+
+# use $FILE4 to write some filters  (this file has  no filters)
+
+# gzip with individual object
+  set (arg ${FILE4} -f dset1:GZIP=1  -l dset1:CHUNK=20x10)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (gzip_individual ${TESTTYPE} ${arg})
+
+# gzip for all
+  set (arg ${FILE4} -f GZIP=1)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (gzip_all ${TESTTYPE} ${arg})
+
+# szip with individual object
+  set (arg ${FILE4} -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+  ADD_H5_TEST (szip_individual ${TESTTYPE} ${arg})
+
+# szip for all
+  set (arg ${FILE4} -f SZIP=8,NN)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+  ADD_H5_TEST (szip_all ${TESTTYPE} ${arg})
+
+# shuffle with individual object
+  set (arg ${FILE4} -f dset2:SHUF  -l dset2:CHUNK=20x10)
+  ADD_H5_TEST (shuffle_individual "TEST" ${arg})
+
+# shuffle for all
+  set (arg ${FILE4} -f SHUF)
+  ADD_H5_TEST (shuffle_all "TEST" ${arg})
+
+# fletcher32  with individual object
+  set (arg ${FILE4} -f dset2:FLET  -l dset2:CHUNK=20x10)
+  ADD_H5_TEST (fletcher_individual "TEST" ${arg})
+
+# fletcher32 for all
+  set (arg ${FILE4} -f FLET)
+  ADD_H5_TEST (fletcher_all "TEST" ${arg})
+
+# all filters
+  set (arg ${FILE4} -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (all_filters ${TESTTYPE} ${arg})
+
+# verbose gzip with individual object
+  set (arg ${FILE11} -v -f /dset_deflate:GZIP=9)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_CMP_TEST (gzip_verbose_filters "O?...ing file[^\n]+\n" ${TESTTYPE} 0 ${arg})
+
+###########################################################
+# the following tests assume the input files have filters
+###########################################################
+
+# szip copy
+  set (arg ${FILE7})
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+  ADD_H5_TEST (szip_copy ${TESTTYPE} ${arg})
+
+# szip remove
+  set (arg ${FILE7} --filter=dset_szip:NONE)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP)
+  ADD_H5_TEST (szip_remove ${TESTTYPE} ${arg})
+
+# deflate copy
+  set (arg ${FILE8})
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (deflate_copy ${TESTTYPE} ${arg})
+
+# deflate remove
+  set (arg ${FILE8} -f dset_deflate:NONE)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (deflate_remove ${TESTTYPE} ${arg})
+
+# shuffle copy
+  set (arg ${FILE9})
+  ADD_H5_TEST (shuffle_copy "TEST" ${arg})
+
+# shuffle remove
+  set (arg ${FILE9} -f dset_shuffle:NONE)
+  ADD_H5_TEST (shuffle_remove "TEST" ${arg})
+
+# fletcher32 copy
+  set (arg ${FILE10})
+  ADD_H5_TEST (fletcher_copy "TEST" ${arg})
+
+# fletcher32 remove
+  set (arg ${FILE10} -f dset_fletcher32:NONE)
+  ADD_H5_TEST (fletcher_remove "TEST" ${arg})
+
+# nbit copy
+  set (arg ${FILE12})
+  ADD_H5_TEST (nbit_copy "TEST" ${arg})
+
+# nbit remove
+  set (arg ${FILE12} -f dset_nbit:NONE)
+  ADD_H5_TEST (nbit_remove "TEST" ${arg})
+
+# nbit add
+  set (arg ${FILE12} -f dset_int31:NBIT)
+  ADD_H5_TEST (nbit_add "TEST" ${arg})
+
+# scaleoffset copy
+  set (arg ${FILE13})
+  ADD_H5_TEST (scale_copy "TEST" ${arg})
+
+# scaleoffset add
+  set (arg ${FILE13} -f dset_none:SOFF=31,IN)
+  ADD_H5_TEST (scale_add "TEST" ${arg})
+
+# scaleoffset remove
+  set (arg ${FILE13} -f dset_scaleoffset:NONE)
+  ADD_H5_TEST (scale_remove "TEST" ${arg})
+
+# remove all  filters
+  set (arg ${FILE11} -f NONE)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER)
+  ADD_H5_TEST (remove_all ${TESTTYPE} ${arg})
+
+#filter conversions
+  set (arg ${FILE8} -f dset_deflate:SZIP=8,NN)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_SZIP OR NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (deflate_convert ${TESTTYPE} ${arg})
+
+  set (arg ${FILE7} -f dset_szip:GZIP=1)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_SZIP OR NOT USE_FILTER_SZIP_ENCODER OR NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (szip_convert ${TESTTYPE} ${arg})
+
+#limit
+  set (arg ${FILE4} -f GZIP=1 -m 1024)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_DMP_TEST (deflate_limit ${TESTTYPE} 0 ${arg})
+
+#file
+  set (arg ${FILE4} -e ${INFO_FILE})
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (deflate_file ${TESTTYPE} ${arg})
+
+#########################################################
+# layout options (these files have no filters)
+#########################################################
+  ADD_H5_VERIFY_TEST (dset2_chunk_20x10 "TEST" 0 ${FILE4} dset2 CHUNKED --layout=dset2:CHUNK=20x10)
+  ADD_H5_VERIFY_TEST (chunk_20x10 "TEST" 1 ${FILE4} null CHUNKED -l CHUNK=20x10)
+  ADD_H5_VERIFY_TEST (dset2_conti "TEST" 0 ${FILE4} dset2 CONTIGUOUS -l dset2:CONTI)
+  ADD_H5_VERIFY_TEST (conti "TEST" 1 ${FILE4} null CONTIGUOUS -l CONTI)
+  ADD_H5_VERIFY_TEST (dset2_compa "TEST" 0 ${FILE4} dset2 COMPACT -l dset2:COMPA)
+  ADD_H5_VERIFY_TEST (compa "TEST" 1 ${FILE4} null COMPACT -l COMPA)
+  ADD_H5_MASK_TEST (dset2_chunk_20x10-errstk "TEST" 0 ${FILE4} --layout=dset2:CHUNK=20x10x5 --enable-error-stack)
+
+################################################################
+# layout conversions (file has no filters)
+###############################################################
+  ADD_H5_VERIFY_TEST (dset_compa_conti "TEST" 0 ${FILE4} dset_compact CONTIGUOUS -l dset_compact:CONTI)
+  ADD_H5_VERIFY_TEST (dset_compa_chunk "TEST" 0 ${FILE4} dset_compact CHUNKED -l dset_compact:CHUNK=2x5)
+  ADD_H5_VERIFY_TEST (dset_compa_compa "TEST" 0 ${FILE4} dset_compact COMPACT -l dset_compact:COMPA)
+  ADD_H5_VERIFY_TEST (dset_conti_compa "TEST" 0 ${FILE4} dset_contiguous COMPACT -l dset_contiguous:COMPA)
+  ADD_H5_VERIFY_TEST (dset_conti_chunk "TEST" 0 ${FILE4} dset_contiguous CHUNKED -l dset_contiguous:CHUNK=3x6)
+  ADD_H5_VERIFY_TEST (dset_conti_conti "TEST" 0 ${FILE4} dset_contiguous CONTIGUOUS -l dset_contiguous:CONTI)
+  ADD_H5_VERIFY_TEST (chunk_compa "TEST" 0 ${FILE4} dset_chunk COMPACT -l dset_chunk:COMPA)
+  ADD_H5_VERIFY_TEST (chunk_conti "TEST" 0 ${FILE4} dset_chunk CONTIGUOUS -l dset_chunk:CONTI)
+  ADD_H5_VERIFY_TEST (chunk_18x13 "TEST" 0 ${FILE4} dset_chunk CHUNKED -l dset_chunk:CHUNK=18x13)
+
+# test convert small size dataset ( < 1k) to compact layout without -m
+  ADD_H5_VERIFY_TEST (contig_small_compa "TEST" 0 ${FILE18} contig_small COMPACT -l contig_small:COMPA)
+  ADD_H5_VERIFY_TEST (contig_small_fixed_compa "TEST" 0 ${FILE18} chunked_small_fixed COMPACT -l chunked_small_fixed:COMPA)
+
+#---------------------------------------------------------------------------
+# Test file contains chunked datasets (need multiple dsets) with
+# unlimited max dims.   (HDFFV-7933)
+# Use first dset to test.
+#---------------------------------------------------------------------------
+# chunk to chunk - specify chunk dim bigger than any current dim
+  ADD_H5_VERIFY_TEST (chunk2chunk "TEST" 0 h5repack_layout3.h5 chunk_unlimit1 CHUNK -l chunk_unlimit1:CHUNK=100x300)
+
+# chunk to contiguous
+  ADD_H5_VERIFY_TEST (chunk2conti "TEST" 0 h5repack_layout3.h5 chunk_unlimit1 CONTI -l chunk_unlimit1:CONTI)
+
+# chunk to compact - convert big dataset (should be > 64k) for this purpose,
+# should remain as original layout (chunk)
+  ADD_H5_VERIFY_TEST (chunk2compa "TEST" 0 h5repack_layout3.h5 chunk_unlimit1 CHUNK -l chunk_unlimit1:COMPA)
+
+#--------------------------------------------------------------------------
+# Test -f for some specific cases. Chunked dataset with unlimited max dims.
+# (HDFFV-8012)
+#--------------------------------------------------------------------------
+# - should not fail
+# - should not change max dims from unlimit
+
+# chunk dim is bigger than dataset dim. ( dset size < 64k )
+  ADD_H5_VERIFY_TEST (error1 "TEST" 0 h5repack_layout3.h5 chunk_unlimit1 H5S_UNLIMITED -f chunk_unlimit1:NONE)
+
+# chunk dim is bigger than dataset dim. ( dset size > 64k )
+  ADD_H5_VERIFY_TEST (error2 "TEST" 0 h5repack_layout3.h5 chunk_unlimit2 H5S_UNLIMITED -f chunk_unlimit2:NONE)
+
+# chunk dims are smaller than dataset dims. ( dset size < 64k )
+  ADD_H5_VERIFY_TEST (error3 "TEST" 0 h5repack_layout3.h5 chunk_unlimit3 H5S_UNLIMITED -f chunk_unlimit3:NONE)
+
+# file input - should not fail
+  ADD_H5_TEST (error4 "TEST" h5repack_layout3.h5 -f NONE)
+
+#--------------------------------------------------------------------------
+# Test base: Convert CHUNK to CONTI for a chunked dataset with small dataset
+# (dset size < 64K) and with unlimited max dims on a condition as follow.
+# (HDFFV-8214)
+#--------------------------------------------------------------------------
+# chunk dim is bigger than dataset dim. should succeed.
+  ADD_H5_VERIFY_TEST (ckdim_biger "TEST" 0 h5repack_layout3.h5 chunk_unlimit2 CONTI -l chunk_unlimit2:CONTI)
+# chunk dim is smaller than dataset dim. should succeed.
+  ADD_H5_VERIFY_TEST (ckdim_smaller "TEST" 0 h5repack_layout3.h5 chunk_unlimit3 CONTI -l chunk_unlimit3:CONTI)
+
+
+
+# Native option
+# Do not use FILE1, as the named dtype will be converted to native, and h5diff will
+# report a difference.
+  ADD_H5_TEST (native_fill "TEST" ${FILE0} -n)
+  ADD_H5_TEST (native_attr "TEST" ${FILE2} -n)
+
+# latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)
+  set (arg --layout CHUNK=20x10 --filter GZIP=1 --minimum=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype])
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_TEST (layout_long_switches ${TESTTYPE} 1 ${FILE4} null CHUNKED ${arg})
+
+# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)
+  set (arg -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype])
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_TEST (layout_short_switches ${TESTTYPE} 1 ${FILE4} null CHUNKED ${arg})
+
+# several global filters
+  set (arg ${FILE4} --filter GZIP=1 --filter SHUF)
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST (global_filters ${TESTTYPE} ${arg})
+
+# syntax of -i infile -o outfile
+# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)
+  set (arg ${FILE4} -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype])
+  set (TESTTYPE "LEGACY")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_TEST_OLD (old_style_layout_short_switches ${TESTTYPE} ${arg})
+
+# add a userblock to file
+  set (arg ${FILE1} -u ${PROJECT_BINARY_DIR}/testfiles/ublock.bin -b 2048)
+  ADD_H5_TEST (add_userblock "TEST" ${arg})
+
+# add alignment
+  set (arg ${FILE1} -t 1 -a 1)
+  ADD_H5_TEST (add_alignment "TEST" ${arg})
+
+# Check repacking file with old version of layout message (should get upgraded
+# to new version and be readable, etc.)
+  ADD_H5_TEST (upgrade_layout "TEST" ${FILE14})
+
+# test for datum size > H5TOOLS_MALLOCSIZE
+  ADD_H5_TEST (gt_mallocsize "TEST" ${FILE1} -f GZIP=1)
+
+# Check repacking file with committed datatypes in odd configurations
+  ADD_H5_TEST (committed_dt "TEST" ${FILE15})
+
+# tests family driver (file is located in common testfiles folder, uses TOOLTEST1
+  ADD_H5_TEST (family "TEST" ${FILE16})
+
+# test various references (bug 1814 and 1726)
+  ADD_H5_TEST (bug1814 "TEST" ${FILE_REF})
+
+# test attribute with various references (bug1797 / HDFFV-5932)
+# the references in attribute of compund or vlen datatype
+  ADD_H5_TEST (HDFFV-5932 "TEST" ${FILE_ATTR_REF})
+
+# Add test for memory leak in attirbute. This test is verified by CTEST.
+# 1. leak from vlen string
+# 2. leak from compound type without reference member
+# (HDFFV-7840, )
+# Note: this test is experimental for sharing test file among tools
+  ADD_H5_TEST (HDFFV-7840 "TEST" h5diff_attr1.h5)
+
+# tests for metadata block size option ('-M')
+  ADD_H5_TEST_META (meta_short h5repack_layout.h5 -M 8192)
+  ADD_H5_TEST_META (meta_long h5repack_layout.h5 --metadata_block_size=8192)
+
+# VDS tests
+
+################################################################
+# layout conversions
+###############################################################
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_VDS (vds_dset_chunk20x10x5 ${TESTTYPE} 0 ${FILEV1} vds_dset CHUNKED -l vds_dset:CHUNK=20x10x5)
+
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_VDS (vds_chunk2x5x8 ${TESTTYPE} 0 ${FILEV3_1} vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8)
+
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_VDS (vds_chunk3x6x9 ${TESTTYPE} 0 ${FILEV2} vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9)
+
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_VDS (vds_compa ${TESTTYPE} 0 ${FILEV4} vds_dset COMPACT -l vds_dset:COMPA)
+
+  set (TESTTYPE "TEST")
+  if (NOT USE_FILTER_DEFLATE)
+    set (TESTTYPE "SKIP")
+  endif (NOT USE_FILTER_DEFLATE)
+  ADD_H5_VERIFY_VDS (vds_conti ${TESTTYPE} 0 ${FILEV4} vds_dset CONTIGUOUS -l vds_dset:CONTI)
+
+##############################################################################
+###    P L U G I N  T E S T S
+##############################################################################
+  ADD_H5_UD_TEST (plugin_version_test 0 h5repack_layout.h5 -v -f UD=260,4,9,1,9,235)
+  ADD_H5_UD_TEST (plugin_test 0 h5repack_layout.h5 -v -f UD=257,1,9)
+  ADD_H5_UD_TEST (plugin_none 0 h5repack_layout.UD.h5 -v -f NONE)
+  # check for no parameters
+  set (TESTRETVAL 255)
+  if (WIN32)
+    set (TESTRETVAL -1)
+  endif()
+  ADD_H5_CMP_TEST (plugin_zero "" "TEST" ${TESTRETVAL} h5repack_layout.h5 -v -f UD=250,0)
+
+  if (HDF5_TEST_VFD)
+    # Run test with different Virtual File Driver
+    foreach (vfd ${VFD_LIST})
+      ADD_VFD_TEST (${vfd} 0)
+    endforeach (vfd ${VFD_LIST})
+  endif (HDF5_TEST_VFD)
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
new file mode 100644
index 0000000..6c045c4
--- /dev/null
+++ b/tools/test/h5repack/Makefile.am
@@ -0,0 +1,67 @@
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+##
+## Makefile.am
+## Run automake to generate a Makefile.in from this file.
+#
+# HDF5 Library Makefile(.in)
+#
+
+include $(top_srcdir)/config/commence.am
+
+# Include src, test, and tools/lib directories
+AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib -I$(top_srcdir)/tools/src/h5repack
+
+# Test programs and scripts
+TEST_SCRIPT=h5repack.sh
+
+noinst_PROGRAMS=h5repacktst testh5repack_detect_szip
+
+SCRIPT_DEPEND=../../src/h5repack/h5repack$(EXEEXT) h5repacktst$(EXEEXT)
+if HAVE_SHARED_CONDITIONAL
+if USE_PLUGINS_CONDITIONAL
+   TEST_SCRIPT += h5repack_plugin.sh
+endif
+endif
+
+check_SCRIPTS=$(TEST_SCRIPT)
+
+# Depend on the hdf5 library, the tools library, the test library
+LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+
+testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c
+
+# Source files
+COMMON_SOURCES=../../src/h5repack/h5repack.c ../../src/h5repack/h5repack_copy.c ../../src/h5repack/h5repack_filters.c \
+               ../../src/h5repack/h5repack_opttable.c ../../src/h5repack/h5repack_parse.c ../../src/h5repack/h5repack_refs.c \
+               ../../src/h5repack/h5repack_verify.c
+h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c 
+
+
+if HAVE_SHARED_CONDITIONAL
+  # Build it as shared library if configure is enabled for shared library.
+  lib_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
+  libdynlibadd_la_SOURCES=dynlib_rpk.c
+  libdynlibvers_la_SOURCES=dynlib_vrpk.c
+
+install-exec-hook:
+	$(RM) $(DESTDIR)$(libdir)/*dynlib*
+endif
+
+# Temporary files.  *.h5 are generated by h5repack.  They should
+# copied to the testfiles/ directory if update is required.
+CHECK_CLEANFILES+=*.h5 *.bin testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5
+DISTCLEANFILES=h5repack.sh h5repack_plugin.sh
+
+include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/h5repack/dynlib_rpk.c b/tools/test/h5repack/dynlib_rpk.c
new file mode 100644
index 0000000..3469e58
--- /dev/null
+++ b/tools/test/h5repack/dynlib_rpk.c
@@ -0,0 +1,97 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5. The full HDF5 copyright notice, including      *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic document set and is     *
+ * linked from the top-level documents page.  It can also be found at        *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have access   *
+ * to either file, you may request a copy from help@hdfgroup.org.            *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+ * Programmer:    Raymond Lu
+ *        13 February 2013
+ *
+ * Purpose:    Tests the plugin module (H5PL)
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "H5PLextern.h"
+
+#define H5Z_FILTER_DYNLIB1      257
+
+static size_t H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts,
+                const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
+
+/* This message derives from H5Z */
+const H5Z_class2_t H5Z_DYNLIB1[1] = {{
+    H5Z_CLASS_T_VERS,                /* H5Z_class_t version             */
+    H5Z_FILTER_DYNLIB1,             /* Filter id number        */
+    1, 1,                            /* Encoding and decoding enabled   */
+    "dynlib1",                 /* Filter name for debugging    */
+    NULL,                            /* The "can apply" callback        */
+    NULL,                            /* The "set local" callback        */
+    (H5Z_func_t)H5Z_filter_dynlib1,    /* The actual filter function    */
+}};
+
+H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;}
+const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB1;}
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Z_filter_dynlib1
+ *
+ * Purpose:    A dynlib1 filter method that adds on and subtract from
+ *              the original value with another value.  It will be built
+ *              as a shared library.  plugin.c test will load and use
+ *              this filter library.
+ *
+ * Return:    Success:    Data chunk size
+ *
+ *        Failure:    0
+ *
+ * Programmer:    Raymond Lu
+ *              29 March 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+static size_t
+H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts,
+      const unsigned int *cd_values, size_t nbytes,
+      size_t *buf_size, void **buf)
+{
+    int *int_ptr = (int *)*buf;          /* Pointer to the data values */
+    size_t buf_left = *buf_size;  /* Amount of data buffer left to process */
+    int add_on = 0;
+
+    /* Check for the correct number of parameters */
+    if(cd_nelmts == 0)
+        return 0;
+
+    /* Check that permanent parameters are set correctly */
+    if(cd_values[0] > 9)
+        return 0;
+
+    add_on = (int)cd_values[0];
+
+    if(flags & H5Z_FLAG_REVERSE) { /*read*/
+        /* Substract the "add on" value to all the data values */
+        while(buf_left > 0) {
+            *int_ptr++ -= add_on;
+            buf_left -= sizeof(int);
+        } /* end while */
+    } /* end if */
+    else { /*write*/
+        /* Add the "add on" value to all the data values */
+        while(buf_left > 0) {
+            *int_ptr++ += add_on;
+            buf_left -= sizeof(int);
+        } /* end while */
+    } /* end else */
+
+    return nbytes;
+} /* end H5Z_filter_dynlib1() */
+
diff --git a/tools/test/h5repack/dynlib_vrpk.c b/tools/test/h5repack/dynlib_vrpk.c
new file mode 100644
index 0000000..8da0270
--- /dev/null
+++ b/tools/test/h5repack/dynlib_vrpk.c
@@ -0,0 +1,104 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5. The full HDF5 copyright notice, including      *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic document set and is     *
+ * linked from the top-level documents page.  It can also be found at        *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have access   *
+ * to either file, you may request a copy from help@hdfgroup.org.            *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*
+ * Purpose:    Tests the plugin module (H5PL)
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include "H5PLextern.h"
+
+#define H5Z_FILTER_DYNLIB4      260
+
+#define PUSH_ERR(func, minor, str) H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, H5E_ERR_CLS, H5E_PLUGIN, minor, str)
+
+static size_t H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts,
+                const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
+
+/* This message derives from H5Z */
+const H5Z_class2_t H5Z_DYNLIB4[1] = {{
+    H5Z_CLASS_T_VERS,                /* H5Z_class_t version             */
+    H5Z_FILTER_DYNLIB4,             /* Filter id number        */
+    1, 1,                            /* Encoding and decoding enabled   */
+    "dynlib4",                 /* Filter name for debugging    */
+    NULL,                            /* The "can apply" callback        */
+    NULL,                            /* The "set local" callback        */
+    (H5Z_func_t)H5Z_filter_dynlib4,    /* The actual filter function    */
+}};
+
+H5PL_type_t   H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;}
+const void    *H5PLget_plugin_info(void) {return H5Z_DYNLIB4;}
+
+/*-------------------------------------------------------------------------
+ * Function:    H5Z_filter_dynlib4
+ *
+ * Purpose:    A dynlib4 filter method that adds on and subtract from
+ *              the original value with another value.  It will be built
+ *              as a shared library.  plugin.c test will load and use
+ *              this filter library. Designed to call a HDF function.
+ *
+ * Return:    Success:    Data chunk size
+ *
+ *        Failure:    0
+ *
+ *-------------------------------------------------------------------------
+ */
+static size_t
+H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts,
+      const unsigned int *cd_values, size_t nbytes,
+      size_t *buf_size, void **buf)
+{
+    int *int_ptr = (int *)*buf;          /* Pointer to the data values */
+    size_t buf_left = *buf_size;  /* Amount of data buffer left to process */
+    int add_on = 0;
+    unsigned ver_info[3];
+
+    /* Check for the library version */
+    if(H5get_libversion(&ver_info[0], &ver_info[1], &ver_info[2]) < 0) {
+        PUSH_ERR("dynlib4", H5E_CALLBACK, "H5get_libversion");
+        return(0);
+    }
+    /* Check for the correct number of parameters */
+    if(cd_nelmts == 0)
+        return(0);
+
+    /* Check that permanent parameters are set correctly */
+    if(cd_values[0] > 9)
+        return(0);
+
+    if(ver_info[0] != cd_values[1] || ver_info[1] != cd_values[2]) {
+        PUSH_ERR("dynlib4", H5E_CALLBACK, "H5get_libversion does not match");
+        return(0);
+    }
+
+    add_on = (int)cd_values[0];
+
+    if(flags & H5Z_FLAG_REVERSE) { /*read*/
+        /* Substract the "add on" value to all the data values */
+        while(buf_left > 0) {
+            *int_ptr++ -= add_on;
+            buf_left -= sizeof(int);
+        } /* end while */
+    } /* end if */
+    else { /*write*/
+        /* Add the "add on" value to all the data values */
+        while(buf_left > 0) {
+            *int_ptr++ += add_on;
+            buf_left -= sizeof(int);
+        } /* end while */
+    } /* end else */
+
+    return nbytes;
+} /* end H5Z_filter_dynlib4() */
+
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
new file mode 100644
index 0000000..4d3cae8
--- /dev/null
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -0,0 +1,1265 @@
+#! /bin/sh
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+#
+# Tests for the h5repack tool
+#
+# Modification:
+#  Pedro Vicente Nunes, 11/15/2006
+#  Added $FILEN variables for file names
+#
+
+srcdir=@srcdir@
+
+USE_FILTER_SZIP="@USE_FILTER_SZIP@"
+USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
+
+TESTNAME=h5repack
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+H5REPACK=../../src/h5repack/h5repack              # The tool name
+H5REPACK_BIN=`pwd`/$H5REPACK    # The path of the tool binary
+
+H5DIFF=../../src/h5diff/h5diff         # The h5diff tool name
+H5DIFF_BIN=`pwd`/$H5DIFF        # The path of the h5diff tool binary
+
+H5DUMP=../../src/h5dump/h5dump         # The h5dump tool name
+H5DUMP_BIN=`pwd`/$H5DUMP        # The path of the h5dump tool binary
+
+RM='rm -rf'
+CMP='cmp'
+DIFF='diff -c'
+GREP='grep'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
+H5DETECTSZIP=testh5repack_detect_szip
+H5DETECTSZIP_BIN=`pwd`/$H5DETECTSZIP
+
+
+nerrors=0
+verbose=yes
+
+# source dirs
+SRC_TOOLS="$srcdir/../.."
+SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+
+# testfiles source dirs for tools
+SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DIFF_TESTFILES="$SRC_TOOLS/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"
+
+TESTDIR=./testpack
+test -d $TESTDIR || mkdir $TESTDIR
+
+######################################################################
+# test files
+# --------------------------------------------------------------------
+# All the test files copy from source directory to test directory
+# NOTE: Keep this framework to add/remove test files.
+#       Any test files from other tools can be used in this framework.
+#       This list are also used for checking exist.
+#       Comment '#' without space can be used.
+# --------------------------------------------------------------------
+LIST_HDF5_TEST_FILES="
+$SRC_H5REPACK_TESTFILES/h5repack_attr.h5
+$SRC_H5REPACK_TESTFILES/h5repack_attr_refs.h5
+$SRC_H5REPACK_TESTFILES/h5repack_deflate.h5
+$SRC_H5REPACK_TESTFILES/h5repack_early.h5
+$SRC_H5REPACK_TESTFILES/h5repack_ext.h5
+$SRC_H5REPACK_TESTFILES/h5repack_fill.h5
+$SRC_H5REPACK_TESTFILES/h5repack_filters.h5
+$SRC_H5REPACK_TESTFILES/h5repack_fletcher.h5
+$SRC_H5REPACK_TESTFILES/h5repack_hlink.h5
+$SRC_H5REPACK_TESTFILES/h5repack_layout.h5
+$SRC_H5REPACK_TESTFILES/h5repack_layouto.h5
+$SRC_H5REPACK_TESTFILES/h5repack_layout2.h5
+$SRC_H5REPACK_TESTFILES/h5repack_layout3.h5
+$SRC_H5REPACK_TESTFILES/h5repack_named_dtypes.h5
+$SRC_H5REPACK_TESTFILES/h5repack_nested_8bit_enum.h5
+$SRC_H5REPACK_TESTFILES/h5repack_nested_8bit_enum_deflated.h5
+$SRC_H5REPACK_TESTFILES/h5repack_nbit.h5
+$SRC_H5REPACK_TESTFILES/h5repack_objs.h5
+$SRC_H5REPACK_TESTFILES/h5repack_refs.h5
+$SRC_H5REPACK_TESTFILES/h5repack_shuffle.h5
+$SRC_H5REPACK_TESTFILES/h5repack_soffset.h5
+$SRC_H5REPACK_TESTFILES/h5repack_szip.h5
+$SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
+$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/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
+"
+
+LIST_OTHER_TEST_FILES="
+$SRC_H5REPACK_TESTFILES/h5repack-help.txt
+$SRC_H5REPACK_TESTFILES/h5repack_ext.bin
+$SRC_H5REPACK_TESTFILES/ublock.bin
+$SRC_H5REPACK_TESTFILES/h5repack.info
+$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
+$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
+$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
+$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
+$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
+"
+
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES"
+
+COPY_TESTFILES_TO_TESTDIR()
+{
+    # copy test files. Used -f to make sure get a new copy
+    for tstfile in $COPY_TESTFILES
+    do
+        # ignore '#' comment
+        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+        RET=$?
+        if [ $RET -eq 1 ]; then
+            # skip cp if srcdir is same as destdir
+            # this occurs when build/test performed in source dir and
+            # make cp fail
+            SDIR=`$DIRNAME $tstfile`
+            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+    	        $CP -f $tstfile $TESTDIR
+                if [ $? -ne 0 ]; then
+                    echo "Error: FAILED to copy $tstfile ."
+
+                    # Comment out this to CREATE expected file
+                    exit $EXIT_FAILURE
+                fi
+            fi
+        fi
+    done
+}
+
+CLEAN_TESTFILES_AND_TESTDIR()
+{
+    # skip rm if srcdir is same as destdir
+    # this occurs when build/test performed in source dir and
+    # make cp fail
+    SDIR=$SRC_H5REPACK_TESTFILES
+    INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+    INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+    if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+        $RM $TESTDIR
+    fi
+}
+
+# Print a $* message left justified in a field of 70 characters
+#
+MESSAGE() {
+   SPACES="                                                               "
+   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+#
+TESTING() {
+    MESSAGE "Testing $*"
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Verifying".
+#
+VERIFY() {
+    MESSAGE "Verifying $*"
+}
+
+# Print a message that a test has been skipped (because a required filter
+# was unavailable)
+SKIP() {
+    TESTING $H5REPACK $@
+    echo " -SKIP-"
+}
+
+# Call the h5diff tool
+#
+DIFFTEST()
+{
+    VERIFY h5diff output $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN -q  "$@"
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+         echo "*FAILED*"
+         nerrors="`expr $nerrors + 1`"
+    else
+         echo " PASSED"
+    fi
+
+}
+
+# Call h5repack
+#
+
+
+# call TOOLTEST_MAIN and delete $output file
+TOOLTEST()
+{
+    echo $@
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+    rm -f $outfile
+}
+
+#------------------------------------------
+# Verifying layouts of a dataset
+VERIFY_LAYOUT_DSET()
+{
+    layoutfile=layout-$1.$2
+    dset=$3
+    expectlayout=$4
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+    shift
+    shift
+
+    TESTING  $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+
+    #---------------------------------
+    # check the layout from a dataset
+    VERIFY  "a dataset layout"
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5DUMP_BIN -d $dset -pH $outfile > $layoutfile
+    )
+    $GREP $expectlayout $TESTDIR/$layoutfile > /dev/null
+    if [ $? -eq 0 ]; then
+        echo " PASSED"
+    else
+        echo " FAILED"
+        nerrors="`expr $nerrors + 1`"
+    fi
+
+    # clean up tmp files
+    rm -f $outfile
+    rm -f $layoutfile
+}
+
+#------------------------------------------
+# Verifying layouts of a dataset
+VERIFY_LAYOUT_VDS()
+{
+    layoutfile=layout-$1.$2
+    dset=$3
+    expectlayout=$4
+    infile=$2
+    outfile=out-$1.$2
+
+    expect="$TESTDIR/$2-$1-v.ddl"
+    actual="$TESTDIR/$2-$1-v.out"
+    actual_err="$TESTDIR/$2-$1-v.err"
+
+    shift
+    shift
+    shift
+    shift
+
+    TESTING  $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+    fi
+
+    #---------------------------------
+    # check the layout from a dataset
+    VERIFY  "a dataset layout"
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5DUMP_BIN -d $dset -p $outfile
+    ) >$actual 2>$actual_err
+
+    cat $actual_err >> $actual
+
+    if [ ! -f $expect ]; then
+    # Create the expect file if it doesn't yet exist.
+     echo " CREATED"
+     cp $actual $expect
+    elif $CMP $expect $actual > /dev/null 2>&1 ; then
+     echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actual_err
+    fi
+
+    # clean up tmp files
+    rm -f $outfile
+}
+
+#----------------------------------------
+# Verifying layouts from entire file
+VERIFY_LAYOUT_ALL()
+{
+    infile=$2
+    outfile=out-$1.$2
+    layoutfile=layout-$1.$2
+    expectlayout=$3
+    shift
+    shift
+    shift
+
+    TESTING  $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+
+
+    #---------------------------------
+    # check the layout from a dataset
+    # check if the other layouts still exsit
+    VERIFY  "layouts"
+    (
+        cd $TESTDIR
+        echo
+        # if CONTIGUOUS
+        if [ $expectlayout = "CONTIGUOUS" ]; then
+            TESTING $H5DUMP_BIN -pH $outfile
+            (
+                $RUNSERIAL $H5DUMP_BIN -pH $outfile > $layoutfile
+            )
+            $GREP "COMPACT" $layoutfile  > /dev/null
+            if [ $? -eq 0 ]; then
+                echo " FAILED"
+                nerrors="`expr $nerrors + 1`"
+            else
+                $GREP "CHUNKED" $layoutfile  > /dev/null
+                if [ $? -eq 0 ]; then
+                    echo " FAILED"
+                    nerrors="`expr $nerrors + 1`"
+                else
+                    echo " PASSED"
+                fi
+            fi
+        else
+            # if COMPACT
+            if [ $expectlayout = "COMPACT" ]; then
+                TESTING $H5DUMP_BIN -pH $outfile
+                (
+                    $RUNSERIAL $H5DUMP_BIN -pH $outfile > $layoutfile
+                )
+                $GREP "CHUNKED" $layoutfile  > /dev/null
+                if [ $? -eq 0 ]; then
+                    echo " FAILED"
+                    nerrors="`expr $nerrors + 1`"
+                else
+                    $GREP "CONTIGUOUS" $layoutfile  > /dev/null
+                    if [ $? -eq 0 ]; then
+                        echo " FAILED"
+                        nerrors="`expr $nerrors + 1`"
+                    else
+                        echo " PASSED"
+                    fi
+                fi
+            else
+                # if CHUNKED
+                if [ $expectlayout = "CHUNKED" ]; then
+                    TESTING $H5DUMP_BIN -pH $outfile
+                    (
+                        $RUNSERIAL $H5DUMP_BIN -pH $outfile > $layoutfile
+                    )
+                    $GREP "CONTIGUOUS" $layoutfile  > /dev/null
+                    if [ $? -eq 0 ]; then
+                        echo " FAILED"
+                        nerrors="`expr $nerrors + 1`"
+                    else
+                        $GREP "COMPACT" $layoutfile  > /dev/null
+                        if [ $? -eq 0 ]; then
+                            echo " FAILED"
+                            nerrors="`expr $nerrors + 1`"
+                        else
+                            echo " PASSED"
+                        fi
+                    fi
+                fi
+           fi
+        fi
+    )
+
+    # clean up tmp files
+    rm -f $outfile
+    rm -f $layoutfile
+}
+
+# same as TOOLTEST, but it uses the old syntax -i input_file -o output_file
+#
+TOOLTEST0()
+{
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN -i $infile -o $outfile "$@"
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+    rm -f $outfile
+}
+
+
+# same as TOOLTEST, but it uses without -i -o options
+# used to test the family driver, where these files reside
+#
+TOOLTEST1()
+{
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+	echo "*FAILED*"
+	nerrors="`expr $nerrors + 1`"
+    else
+	echo " PASSED"
+	DIFFTEST $infile $outfile
+    fi
+    rm -f $outfile
+}
+
+# This is same as TOOLTEST() with comparing display output
+# from -v option
+#
+TOOLTESTV()
+{
+    expect="$TESTDIR/$2-$1.tst"
+    actual="$TESTDIR/`basename $2 .ddl`.out"
+    actual_err="$TESTDIR/`basename $2 .ddl`.err"
+
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    ) >$actual 2>$actual_err
+    RET=$?
+    if [ $RET != 0 ] ; then
+	echo "*FAILED*"
+	nerrors="`expr $nerrors + 1`"
+    else
+	echo " PASSED"
+	DIFFTEST $infile $outfile
+    fi
+
+    # display output compare
+    STDOUT_FILTER $actual
+    cat $actual_err >> $actual
+
+    VERIFY output from $H5REPACK $@
+    if cmp -s $expect $actual; then
+     echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.tst) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && diff -c $expect $actual |sed 's/^/    /'
+    fi
+
+   rm -f $actual $actual_err
+   rm -f $outfile
+}
+
+# same as TOOLTESTV but filters error stack output and compares to an error file
+# Extract file name, line number, version and thread IDs because they may be different
+# ADD_H5ERR_MASK_TEST
+TOOLTESTM() {
+
+    expect="$TESTDIR/$2-$1.tst"
+    actual="$TESTDIR/`basename $2 .tst`.out"
+    actual_err="$TESTDIR/`basename $2 .tst`.oerr"
+    actual_sav=${actual}-sav
+    actual_err_sav=${actual_err}-sav
+
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    ) >$actual 2>$actual_err
+
+    # save actual and actual_err in case they are needed later.
+    cp $actual $actual_sav
+    cp $actual_err $actual_err_sav
+
+    # Extract file name, line number, version and thread IDs because they may be different
+    sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+        -e 's/line [0-9]*/line (number)/' \
+        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
+        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
+        -e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
+        -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
+     $actual_err > $actual
+
+    if [ ! -f $expect ]; then
+    # Create the expect file if it doesn't yet exist.
+     echo " CREATED"
+     cp $actual $expect
+    elif $CMP $expect $actual; then
+      echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.tst) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+   rm -f $actual $actual_err $actual_sav $actual_err_sav
+    fi
+
+}
+
+# This is same as TOOLTESTV() with comparing h5dump output
+# from -pH option
+#
+TOOLTEST_DUMP()
+{
+    infile=$2
+    outfile=out-$1.$2
+    expect="$TESTDIR/$1.$2.ddl"
+    actual="$TESTDIR/out-$1.$2.out"
+    actual_err="$TESTDIR/out-$1.$2.err"
+
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    ) >$actual 2>$actual_err
+    RET=$?
+    if [ $RET != 0 ] ; then
+    echo "*FAILED*"
+    nerrors="`expr $nerrors + 1`"
+    else
+     echo " PASSED"
+     VERIFY h5dump output $@
+     (
+        cd $TESTDIR
+        $RUNSERIAL $H5DUMP_BIN -pH $outfile
+     ) >$actual 2>$actual_err
+     cat $actual_err >> $actual
+
+     RET=$?
+
+    fi
+
+    if cmp -s $expect $actual; then
+     echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && diff -c $expect $actual |sed 's/^/    /'
+    fi
+
+   rm -f $actual $actual_err
+   rm -f $outfile
+}
+
+# TOOLTEST_META:
+# Test metadata block size option.
+# Reason to create a function here is to localize all special steps related to
+# metadata block size option in one place.  This is a quick solution.  More
+# thought out solution needed when there is more time.
+#
+# $1: test input file
+# $2:$: metadata options (either "-M size" or "--metadata_block_size=size")
+#
+# Algorithm:
+# Run it once without the metadata option ($2-$);
+# Save the result output file;
+# Run it second time with the metadata option;
+# Verify the output file of second run is larger than the one of 1st run.
+TOOLTEST_META()
+{
+    infile=$2
+    outfile=out-$1.$2
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+    # get the size of the first output file
+    size1=`wc -c $TESTDIR/$outfile | cut -d' ' -f1`
+
+    # 2nd run with metadata option
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+        cd $TESTDIR
+        $RUNSERIAL $H5REPACK_BIN "$@" $infile $outfile
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    else
+        echo " PASSED"
+        DIFFTEST $infile $outfile
+    fi
+    # get the size of the second output file
+    size2=`wc -c $TESTDIR/$outfile | cut -d' ' -f1`
+
+    # verify sizes.
+    MESSAGE "Verify the sizes of both output files ($size1 vs $size2)"
+    if [ $size1 -lt $size2 ]; then
+    	# pass
+	echo " PASSED"
+    else
+	#fail
+	echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    fi
+
+    rm -f $outfile
+}
+
+# ADD_HELP_TEST
+TOOLTEST_HELP() {
+
+    expect="$TESTDIR/$1"
+    actual="$TESTDIR/`basename $1 .txt`.out"
+    actual_err="$TESTDIR/`basename $1 .txt`.err"
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $H5REPACK_BIN "$@"
+    ) >$actual 2>$actual_err
+    cat $actual_err >> $actual
+
+    if [ ! -f $expect ]; then
+    # Create the expect data file if it doesn't yet exist.
+      echo " CREATED"
+      cp $actual $expect-CREATED
+    elif cmp -s $expect $actual; then
+      echo " PASSED"
+    else
+      echo "*FAILED*"
+      echo "    Expected output (*.txt) differs from actual output (*.out)"
+      nerrors="`expr $nerrors + 1`"
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actual_err
+    fi
+
+}
+
+# This is different from $srcdir/../../../bin/output_filter.sh
+STDOUT_FILTER() {
+    result_file=$1
+    tmp_file=/tmp/h5test_tmp_$$
+    # Filter name of files.
+    cp $result_file $tmp_file
+    sed -e '/^Opening file/d' -e '/^Making file/d' \
+    < $tmp_file > $result_file
+    # cleanup
+    rm -f $tmp_file
+}
+
+#
+# The tests
+# We use the files generated by h5repacktst
+# Each run generates "<file>.out.h5" and the tool h5diff is used to
+# compare the input and output files
+#
+# the tests are the same as the program h5repacktst, but run from the CLI
+#
+
+# See which filters are usable (and skip tests for filters we
+# don't have).  Do this by searching H5pubconf.h to see which
+# filters are defined.
+
+# detect whether the encoder is present.
+USE_FILTER_SZIP_ENCODER="no";
+if test $USE_FILTER_SZIP = "yes"; then
+USE_FILTER_SZIP_ENCODER=`$RUNSERIAL $H5DETECTSZIP_BIN`
+fi
+
+##############################################################################
+###			  T H E   T E S T S
+##############################################################################
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
+
+TOOLTEST_HELP h5repack-help.txt -h
+
+# copy files (these files have no filters)
+TOOLTEST fill h5repack_fill.h5
+TOOLTEST objs h5repack_objs.h5
+TOOLTEST attr h5repack_attr.h5
+TOOLTEST hlink h5repack_hlink.h5
+TOOLTEST layout h5repack_layout.h5
+TOOLTEST early h5repack_early.h5
+
+# nested 8bit enum in both deflated and non-deflated datafiles
+if [ $USE_FILTER_DEFLATE != "yes" ]; then
+TOOLTEST nested_8bit_enum h5repack_nested_8bit_enum.h5
+else
+TOOLTEST nested_8bit_enum h5repack_nested_8bit_enum_deflated.h5
+fi
+
+# use h5repack_layout.h5 to write some filters  (this file has  no filters)
+
+# gzip with individual object
+arg="h5repack_layout.h5 -f dset1:GZIP=1  -l dset1:CHUNK=20x10"
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST gzip_individual $arg
+fi
+
+# gzip for all
+arg="h5repack_layout.h5 -f GZIP=1"
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST gzip_all $arg
+fi
+
+# szip with individual object
+arg="h5repack_layout.h5 -f dset2:SZIP=8,EC  -l dset2:CHUNK=20x10"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST szip_individual $arg
+fi
+
+# szip for all
+arg="h5repack_layout.h5 -f SZIP=8,NN"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST szip_all $arg
+fi
+
+# shuffle with individual object
+arg="h5repack_layout.h5 -f dset2:SHUF  -l dset2:CHUNK=20x10"
+TOOLTEST shuffle_individual $arg
+
+
+# shuffle for all
+arg="h5repack_layout.h5 -f SHUF"
+TOOLTEST shuffle_all $arg
+
+# fletcher32  with individual object
+arg="h5repack_layout.h5 -f dset2:FLET  -l dset2:CHUNK=20x10"
+TOOLTEST fletcher_individual $arg
+
+# fletcher32 for all
+arg="h5repack_layout.h5 -f FLET"
+TOOLTEST fletcher_all $arg
+
+# all filters
+arg="h5repack_layout.h5 -f dset2:SHUF -f dset2:FLET -f dset2:SZIP=8,NN -f dset2:GZIP=1 -l dset2:CHUNK=20x10"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST all_filters $arg
+fi
+
+# verbose gzip with individual object
+arg="h5repack_filters.h5 -v -f /dset_deflate:GZIP=9"
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ # compare output
+ TOOLTESTV gzip_verbose_filters $arg
+fi
+
+###########################################################
+# the following tests assume the input files have filters
+###########################################################
+
+# szip copy
+arg="h5repack_szip.h5"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST szip_copy $arg
+fi
+
+# szip remove
+arg="h5repack_szip.h5 --filter=dset_szip:NONE"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST szip_remove $arg
+fi
+
+# deflate copy
+arg="h5repack_deflate.h5"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST deflate_copy $arg
+fi
+
+# deflate remove
+arg="h5repack_deflate.h5 -f dset_deflate:NONE"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST deflate_remove $arg
+fi
+
+# shuffle copy
+arg="h5repack_shuffle.h5"
+TOOLTEST shuffle_copy $arg
+
+# shuffle remove
+arg="h5repack_shuffle.h5 -f dset_shuffle:NONE"
+TOOLTEST shuffle_remove $arg
+
+# fletcher32 copy
+arg="h5repack_fletcher.h5"
+TOOLTEST fletcher_copy $arg
+
+# fletcher32 remove
+arg="h5repack_fletcher.h5 -f dset_fletcher32:NONE"
+TOOLTEST fletcher_remove $arg
+
+# nbit copy
+arg="h5repack_nbit.h5"
+TOOLTEST nbit_copy $arg
+
+# nbit remove
+arg="h5repack_nbit.h5 -f dset_nbit:NONE"
+TOOLTEST nbit_remove $arg
+
+# nbit add
+arg="h5repack_nbit.h5 -f dset_int31:NBIT"
+TOOLTEST nbit_add $arg
+
+# scaleoffset copy
+arg="h5repack_soffset.h5"
+TOOLTEST scale_copy $arg
+
+# scaleoffset add
+arg="h5repack_soffset.h5 -f dset_none:SOFF=31,IN"
+TOOLTEST scale_add $arg
+
+# scaleoffset remove
+arg="h5repack_soffset.h5 -f dset_scaleoffset:NONE"
+TOOLTEST scale_remove $arg
+
+# remove all  filters
+arg="h5repack_filters.h5 -f NONE"
+if test $USE_FILTER_DEFLATE != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_SZIP_ENCODER != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST remove_all $arg
+fi
+
+#filter conversions
+
+arg="h5repack_deflate.h5 -f dset_deflate:SZIP=8,NN"
+if test $USE_FILTER_SZIP_ENCODER != "yes" -o $USE_FILTER_SZIP != "yes" -o $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST deflate_convert $arg
+fi
+
+arg="h5repack_szip.h5 -f dset_szip:GZIP=1"
+if test $USE_FILTER_SZIP != "yes" -o $USE_FILTER_SZIP_ENCODER != "yes"  -o $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST szip_convert $arg
+fi
+
+
+#limit
+arg="h5repack_layout.h5 -f GZIP=1 -m 1024"
+if test $USE_FILTER_DEFLATE != "yes"  ; then
+ SKIP $arg
+else
+ TOOLTEST_DUMP deflate_limit $arg
+fi
+
+#file
+arg="h5repack_layout.h5 -e h5repack.info"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST deflate_file $arg
+fi
+
+#########################################################
+# layout options (these files have no filters)
+#########################################################
+VERIFY_LAYOUT_DSET dset2_chunk_20x10 h5repack_layout.h5 dset2 CHUNKED --layout dset2:CHUNK=20x10
+
+VERIFY_LAYOUT_ALL chunk_20x10 h5repack_layout.h5 CHUNKED -l CHUNK=20x10
+
+VERIFY_LAYOUT_DSET dset2_conti h5repack_layout.h5 dset2 CONTIGUOUS -l dset2:CONTI
+
+VERIFY_LAYOUT_ALL conti h5repack_layout.h5 CONTIGUOUS -l CONTI
+
+VERIFY_LAYOUT_DSET dset2_compa h5repack_layout.h5 dset2 COMPACT -l dset2:COMPA
+
+VERIFY_LAYOUT_ALL compa h5repack_layout.h5 COMPACT -l COMPA
+
+TOOLTESTM dset2_chunk_20x10-errstk h5repack_layout.h5 --layout=dset2:CHUNK=20x10x5 --enable-error-stack
+
+################################################################
+# layout conversions (file has no filters)
+###############################################################
+
+VERIFY_LAYOUT_DSET dset_compa_conti h5repack_layout.h5 dset_compact CONTIGUOUS -l dset_compact:CONTI
+
+VERIFY_LAYOUT_DSET dset_compa_chunk h5repack_layout.h5 dset_compact CHUNKED -l dset_compact:CHUNK=2x5
+
+VERIFY_LAYOUT_DSET dset_compa_compa h5repack_layout.h5 dset_compact COMPACT -l dset_compact:COMPA
+
+VERIFY_LAYOUT_DSET dset_conti_compa h5repack_layout.h5 dset_contiguous COMPACT -l dset_contiguous:COMPA
+
+VERIFY_LAYOUT_DSET dset_conti_chunk h5repack_layout.h5 dset_contiguous CHUNKED -l dset_contiguous:CHUNK=3x6
+
+VERIFY_LAYOUT_DSET dset_conti_conti h5repack_layout.h5 dset_contiguous CONTIGUOUS -l dset_contiguous:CONTI
+
+VERIFY_LAYOUT_DSET chunk_compa h5repack_layout.h5 dset_chunk COMPACT -l dset_chunk:COMPA
+
+VERIFY_LAYOUT_DSET chunk_conti h5repack_layout.h5 dset_chunk CONTIGUOUS -l dset_chunk:CONTI
+
+VERIFY_LAYOUT_DSET chunk_18x13 h5repack_layout.h5 dset_chunk CHUNKED -l dset_chunk:CHUNK=18x13
+
+# test convert small size dataset ( < 1k) to compact layout without -m
+VERIFY_LAYOUT_DSET contig_small_compa h5repack_layout2.h5 contig_small COMPACT -l contig_small:COMPA
+
+VERIFY_LAYOUT_DSET contig_small_fixed_compa h5repack_layout2.h5 chunked_small_fixed COMPACT -l chunked_small_fixed:COMPA
+
+#---------------------------------------------------------------------------
+# Test file contains chunked datasets (need multiple dsets) with
+# unlimited max dims.   (HDFFV-7933)
+# Use first dset to test.
+#---------------------------------------------------------------------------
+# chunk to chunk - specify chunk dim bigger than any current dim
+VERIFY_LAYOUT_DSET chunk2chunk h5repack_layout3.h5 chunk_unlimit1 CHUNK -l chunk_unlimit1:CHUNK=100x300
+
+# chunk to contiguous
+VERIFY_LAYOUT_DSET chunk2conti h5repack_layout3.h5 chunk_unlimit1 CONTI -l chunk_unlimit1:CONTI
+
+# chunk to compact - convert big dataset (should be > 64k) for this purpose,
+# should remain as original layout (chunk)
+VERIFY_LAYOUT_DSET chunk2compa h5repack_layout3.h5 chunk_unlimit1 CHUNK -l chunk_unlimit1:COMPA
+
+#--------------------------------------------------------------------------
+# Test -f for some specific cases. Chunked dataset with unlimited max dims.
+# (HDFFV-8012)
+#--------------------------------------------------------------------------
+# - should not fail
+# - should not change max dims from unlimit
+
+# chunk dim is bigger than dataset dim. ( dset size < 64k )
+VERIFY_LAYOUT_DSET error1 h5repack_layout3.h5 chunk_unlimit1 H5S_UNLIMITED -f chunk_unlimit1:NONE
+# chunk dim is bigger than dataset dim. ( dset size > 64k )
+VERIFY_LAYOUT_DSET error2 h5repack_layout3.h5 chunk_unlimit2 H5S_UNLIMITED -f chunk_unlimit2:NONE
+
+# chunk dims are smaller than dataset dims. ( dset size < 64k )
+#TOOLTEST_MAIN h5repack_layout3.h5  -f chunk_unlimit3:NONE
+VERIFY_LAYOUT_DSET error3 h5repack_layout3.h5 chunk_unlimit3 H5S_UNLIMITED -f chunk_unlimit3:NONE
+
+# file input - should not fail
+TOOLTEST error4 h5repack_layout3.h5 -f NONE
+
+#--------------------------------------------------------------------------
+# Test base: Convert CHUNK to CONTI for a chunked dataset with small dataset
+# (dset size < 64K) and with unlimited max dims on a condition as follow.
+# (HDFFV-8214)
+#--------------------------------------------------------------------------
+
+# chunk dim is bigger than dataset dim. should succeed.
+VERIFY_LAYOUT_DSET ckdim_biger h5repack_layout3.h5 chunk_unlimit2 CONTI -l chunk_unlimit2:CONTI
+# chunk dim is smaller than dataset dim. should succeed.
+VERIFY_LAYOUT_DSET ckdim_smaller h5repack_layout3.h5 chunk_unlimit3 CONTI -l chunk_unlimit3:CONTI
+
+
+# Native option
+# Do not use FILE1, as the named dtype will be converted to native, and h5diff will
+# report a difference.
+TOOLTEST native_fill h5repack_fill.h5 -n
+TOOLTEST native_attr h5repack_attr.h5 -n
+
+
+# latest file format with long switches. use FILE4=h5repack_layout.h5 (no filters)
+arg="h5repack_layout.h5 --layout CHUNK=20x10 --filter GZIP=1 --minimum=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ VERIFY_LAYOUT_ALL layout_long_switches h5repack_layout.h5 CHUNKED --layout CHUNK=20x10 --filter GZIP=1 --minimum=10 --native --latest --compact=8 --indexed=6 --ssize=8[:dtype]
+fi
+
+# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)
+arg="h5repack_layout.h5 -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ VERIFY_LAYOUT_ALL layout_short_switches h5repack_layout.h5 CHUNKED -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]
+fi
+
+# several global filters
+
+arg="h5repack_layout.h5 --filter GZIP=1 --filter SHUF"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST global_filters $arg
+fi
+
+# syntax of -i infile -o outfile
+# latest file format with short switches. use FILE4=h5repack_layout.h5 (no filters)
+arg="h5repack_layout.h5 -l CHUNK=20x10 -f GZIP=1 -m 10 -n -L -c 8 -d 6 -s 8[:dtype]"
+if test $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP $arg
+else
+ TOOLTEST0 old_style_layout_short_switches $arg
+fi
+
+# add a userblock to file
+arg="h5repack_objs.h5 -u ublock.bin -b 2048"
+TOOLTEST add_userblock $arg
+
+# add alignment
+arg="h5repack_objs.h5 -t 1 -a 1 "
+TOOLTEST add_alignment $arg
+
+# Check repacking file with old version of layout message (should get upgraded
+#       to new version and be readable, etc.)
+TOOLTEST upgrade_layout h5repack_layouto.h5
+
+# test for datum size > H5TOOLS_MALLOCSIZE
+TOOLTEST gt_mallocsize h5repack_objs.h5 -f GZIP=1
+
+# Check repacking file with committed datatypes in odd configurations
+TOOLTEST committed_dt h5repack_named_dtypes.h5
+
+# tests family driver (file is located in common testfiles folder, uses TOOLTEST1
+TOOLTEST1 family tfamily%05d.h5
+
+# test various references (bug 1814 and 1726)
+TOOLTEST bug1814 h5repack_refs.h5
+
+# test attribute with various references (bug1797 / HDFFV-5932)
+# the references in attribute of compund or vlen datatype
+TOOLTEST HDFFV-5932 h5repack_attr_refs.h5
+
+# Add test for memory leak in attirbute. This test is verified by CTEST.
+# 1. leak from vlen string
+# 2. leak from compound type without reference member
+# (HDFFV-7840, )
+# Note: this test is experimental for sharing test file among tools
+TOOLTEST HDFFV-7840 h5diff_attr1.h5
+
+# tests for metadata block size option
+TOOLTEST_META meta_short h5repack_layout.h5 -M 8192
+TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192
+
+# VDS tests
+
+################################################################
+# layout conversions
+###############################################################
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP vds_dset_chunk_20x10x5
+else
+ VERIFY_LAYOUT_VDS vds_dset_chunk_20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5
+fi
+
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP vds_chunk2x5x8
+else
+ VERIFY_LAYOUT_VDS vds_chunk2x5x8 3_1_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=2x5x8
+fi
+
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP vds_chunk3x6x9
+else
+ VERIFY_LAYOUT_VDS vds_chunk3x6x9 2_vds.h5 vds_dset CHUNKED -l vds_dset:CHUNK=3x6x9
+fi
+
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP vds_compa 4_vds.h5
+else
+ VERIFY_LAYOUT_VDS vds_compa 4_vds.h5 vds_dset COMPACT -l vds_dset:COMPA
+fi
+
+if test  $USE_FILTER_DEFLATE != "yes" ; then
+ SKIP vds_conti 4_vds.h5
+else
+ VERIFY_LAYOUT_VDS vds_conti 4_vds.h5 vds_dset CONTIGUOUS -l vds_dset:CONTI
+fi
+
+# Clean up temporary files/directories
+CLEAN_TESTFILES_AND_TESTDIR
+
+if test $nerrors -eq 0 ; then
+    echo "All $TESTNAME tests passed."
+    exit $EXIT_SUCCESS
+else
+    echo "$TESTNAME tests failed with $nerrors errors."
+    exit $EXIT_FAILURE
+fi
+
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
new file mode 100644
index 0000000..c7a9a6b
--- /dev/null
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -0,0 +1,275 @@
+#! /bin/sh
+#
+# Copyright by The HDF Group.                                              
+# All rights reserved.                                                     
+#                                                                          
+# This file is part of HDF5. The full HDF5 copyright notice, including     
+# terms governing use, modification, and redistribution, is contained in   
+# the files COPYING and Copyright.html.  COPYING can be found at the root  
+# of the source code distribution tree; Copyright.html can be found at the 
+# root level of an installed copy of the electronic document set and is    
+# linked from the top-level documents page.  It can also be found at       
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have access  
+# to either file, you may request a copy from help@hdfgroup.org.           
+#
+srcdir=@srcdir@
+TOP_BUILDDIR=@top_builddir@
+
+# Determine backward compatibility options enabled
+DEPRECATED_SYMBOLS="@DEPRECATED_SYMBOLS@"
+
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+H5REPACK=../../src/h5repack/h5repack               # The tool name
+H5REPACK_BIN=`pwd`/$H5REPACK    # The path of the tool binary
+
+H5DUMP=../../src/h5dump/h5dump         # The h5dump tool name
+H5DUMP_BIN=`pwd`/$H5DUMP        # The path of the h5dump tool binary
+
+nerrors=0
+verbose=yes
+exit_code=$EXIT_SUCCESS
+
+TEST_NAME=ud_plugin
+FROM_DIR=`pwd`/.libs
+PLUGIN_LIB="$FROM_DIR/libdynlibadd.*"
+PLUGIN_LIB2="$FROM_DIR/libdynlibvers.*"
+PLUGIN_LIBDIR=testdir3
+RM='rm -rf'
+
+GREP='grep'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
+# source dirs
+SRC_TOOLS="$srcdir/../.."
+
+# testfiles source dirs for tools
+SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
+
+TESTDIR=testplug
+test -d $TESTDIR || mkdir $TESTDIR
+
+######################################################################
+# test files
+# --------------------------------------------------------------------
+# All the test files copy from source directory to test directory
+# NOTE: Keep this framework to add/remove test files.
+#       Any test files from other tools can be used in this framework.
+#       This list are also used for checking exist.
+#       Comment '#' without space can be used.
+# --------------------------------------------------------------------
+LIST_HDF5_TEST_FILES="
+$SRC_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_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
+#"
+
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES"
+
+# Main Body
+# Create test directories if not exists yet.
+test -d $PLUGIN_LIBDIR || mkdir -p $PLUGIN_LIBDIR
+if [ $? != 0 ]; then
+    echo "Failed to create test directory($PLUGIN_LIBDIR)"
+    exit $EXIT_FAILURE
+fi
+
+# copy plugin library for test
+$CP $PLUGIN_LIB $PLUGIN_LIBDIR
+if [ $? != 0 ]; then
+    echo "Failed to copy plugin library ($PLUGIN_LIB) for test."
+    exit $EXIT_FAILURE
+fi
+$CP $PLUGIN_LIB2 $PLUGIN_LIBDIR
+if [ $? != 0 ]; then
+    echo "Failed to copy plugin library ($PLUGIN_LIB2) for test."
+    exit $EXIT_FAILURE
+fi
+
+# setup plugin path
+ENVCMD="env HDF5_PLUGIN_PATH=../${PLUGIN_LIBDIR}"
+
+COPY_TESTFILES_TO_TESTDIR()
+{
+    # copy test files. Used -f to make sure get a new copy
+    for tstfile in $COPY_TESTFILES
+    do
+        # ignore '#' comment
+        echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
+        RET=$?
+        if [ $RET -eq 1 ]; then
+            # skip cp if srcdir is same as destdir
+            # this occurs when build/test performed in source dir and
+            # make cp fail
+            SDIR=`$DIRNAME $tstfile`
+            INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+            INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+            if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+                $CP -f $tstfile $TESTDIR
+                if [ $? -ne 0 ]; then
+                    echo "Error: FAILED to copy $tstfile ."
+
+                    # Comment out this to CREATE expected file
+                    exit $EXIT_FAILURE
+                fi
+            fi
+        fi
+    done
+}
+
+CLEAN_TESTFILES_AND_TESTDIR()
+{
+    # skip rm if srcdir is same as destdir
+    # this occurs when build/test performed in source dir and
+    # make cp fail
+    SDIR=$SRC_H5REPACK_TESTFILES
+    INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
+    INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
+    if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
+        $RM $TESTDIR
+    fi
+}
+
+# Print a $* message left justified in a field of 70 characters
+#
+MESSAGE() {
+   SPACES="                                                               "
+   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+#
+TESTING() {
+    SPACES="                                                               "
+    echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Verifying".
+#
+VERIFY() {
+    MESSAGE "Verifying $*"
+}
+
+# This is different from $srcdir/../../../bin/output_filter.sh
+STDOUT_FILTER() {
+    result_file=$1
+    tmp_file=/tmp/h5test_tmp_$$
+    # Filter name of files.
+    cp $result_file $tmp_file
+    sed -e '/^Opening file/d' -e '/^Making file/d' \
+    < $tmp_file > $result_file
+    # cleanup
+    rm -f $tmp_file
+}
+
+# This runs h5repack comparing output with h5dump output
+# from -pH option
+#
+TOOLTEST_DUMP()
+{
+    echo $@
+    infile=$2
+    outfile=out-$1.$2
+    expect1="$TESTDIR/$1.$2.tst"
+    actual1="$TESTDIR/$1.$2.out"
+    actual1_err="$TESTDIR/$1.$2.err"
+    expect2="$TESTDIR/$2-$1.ddl"
+    actual2="$TESTDIR/$2-$1.out"
+    actual2_err="$TESTDIR/$2-$1.err"
+
+    shift
+    shift
+
+    # Run test.
+    TESTING $H5REPACK $@
+    (
+      cd $TESTDIR
+      $ENVCMD $H5REPACK_BIN "$@" $infile $outfile
+    ) >$actual1 2>$actual1_err
+    RET=$?
+    STDOUT_FILTER $actual1
+    cat $actual1_err >> $actual1
+    if [ $RET != 0 ] ; then
+      echo "*FAILED*"
+      nerrors="`expr $nerrors + 1`"
+    else
+      echo " PASSED"
+      if cmp -s $expect1 $actual1; then
+        echo " PASSED"
+      else
+        echo "*FAILED*"
+        echo "    Expected result (*.tst) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && diff -c $expect1 $actual1 |sed 's/^/    /'
+      fi
+      VERIFY h5dump output -pH $outfile
+      (
+        cd $TESTDIR
+        $ENVCMD $H5DUMP_BIN -pH $outfile
+      ) >$actual2 2>$actual2_err
+      RET=$?
+      cat $actual2_err >> $actual2
+
+      if cmp -s $expect2 $actual2; then
+        echo " PASSED"
+      else
+        echo "*FAILED*"
+      echo "    Expected result (*.ddl) differs from actual result (*.out)"
+      nerrors="`expr $nerrors + 1`"
+      test yes = "$verbose" && diff -c $expect2 $actual2 |sed 's/^/    /'
+     fi
+
+    fi
+
+
+   rm -f $actual1 $actual1_err $actual2 $actual2_err
+   rm -f $outfile
+}
+
+##############################################################################
+###           T H E   T E S T S
+##############################################################################
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
+
+# Run the test
+arg="h5repack_layout.h5 -v -f UD=260,4,9,1,9,235"
+TOOLTEST_DUMP plugin_version_test $arg
+
+arg="h5repack_layout.h5 -v -f UD=257,1,9"
+TOOLTEST_DUMP plugin_test $arg
+
+#arg="h5repack_layout.UD.h5 -v -f NONE"
+#TOOLTEST_DUMP plugin_none $arg
+
+# print results
+if test $nerrors -ne 0 ; then
+    echo "$nerrors errors encountered"
+    exit_code=$EXIT_FAILURE
+else
+    echo "All Plugin API tests passed."
+    exit_code=$EXIT_SUCCESS
+fi
+
+# Clean up temporary files/directories
+CLEAN_TESTFILES_AND_TESTDIR
+
+# Clean up temporary files/directories and leave
+$RM $PLUGIN_LIBDIR
+
+exit $exit_code
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
new file mode 100644
index 0000000..82b45fc
--- /dev/null
+++ b/tools/test/h5repack/h5repacktst.c
@@ -0,0 +1,6856 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+* Copyright by The HDF Group.                                               *
+* Copyright by the Board of Trustees of the University of Illinois.         *
+* All rights reserved.                                                      *
+*                                                                           *
+* This file is part of HDF5.  The full HDF5 copyright notice, including     *
+* terms governing use, modification, and redistribution, is contained in    *
+* the files COPYING and Copyright.html.  COPYING can be found at the root   *
+* of the source code distribution tree; Copyright.html can be found at the  *
+* root level of an installed copy of the electronic HDF5 document set and   *
+* is linked from the top-level documents page.  It can also be found at     *
+* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+* access to either file, you may request a copy from help@hdfgroup.org.     *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include "h5repack.h"
+#include "h5test.h"
+#include "h5diff.h"
+#include "h5tools.h"
+#include "h5tools_utils.h"
+
+#define GOERROR  {H5_FAILED(); goto error;}
+
+
+/* fill value test */
+#define FNAME0     "h5repack_fill.h5"
+#define FNAME0OUT  "h5repack_fill_out.h5"
+/* HDF5 objects and all dataset datatypes */
+#define FNAME1     "h5repack_objs.h5"
+#define FNAME1OUT  "h5repack_objs_out.h5"
+/* attributes, all datatypes  */
+#define FNAME2     "h5repack_attr.h5"
+#define FNAME2OUT  "h5repack_attr_out.h5"
+/* hard links  */
+#define FNAME3     "h5repack_hlink.h5"
+#define FNAME3OUT  "h5repack_hlink_out.h5"
+/* layout  */
+#define FNAME4     "h5repack_layout.h5"
+#define FNAME4OUT  "h5repack_layout_out.h5"
+/* H5D_ALLOC_TIME_EARLY  */
+#define FNAME5     "h5repack_early.h5"
+#define FNAME5OUT  "h5repack_early_out.h5"
+#define FNAME6     "h5repack_early2.h5"
+#ifdef H5_HAVE_FILTER_SZIP
+/* SZIP filter  */
+#define FNAME7     "h5repack_szip.h5"
+#define FNAME7OUT  "h5repack_szip_out.h5"
+#endif
+/* GZIP filter  */
+#define FNAME8     "h5repack_deflate.h5"
+#define FNAME8OUT  "h5repack_deflate_out.h5"
+/* GZIP filter  */
+#define FNAME9     "h5repack_shuffle.h5"
+#define FNAME9OUT  "h5repack_shuffle_out.h5"
+/* Fletcher filter  */
+#define FNAME10    "h5repack_fletcher.h5"
+#define FNAME10OUT "h5repack_fletcher_out.h5"
+/* All filters  */
+#define FNAME11    "h5repack_filters.h5"
+#define FNAME11OUT "h5repack_filters_out.h5"
+/* NBit filter  */
+#define FNAME12    "h5repack_nbit.h5"
+#define FNAME12OUT "h5repack_nbit_out.h5"
+/* Scale Offset filter  */
+#define FNAME13    "h5repack_soffset.h5"
+#define FNAME13OUT "h5repack_soffset_out.h5"
+/* Big file to test read by hyperslabs  */
+#define FNAME14    "h5repack_big.h5"
+#define FNAME14OUT "h5repack_big_out.h5"
+/* external file  */
+#define FNAME15    "h5repack_ext.h5"
+#define FNAME15OUT "h5repack_ext_out.h5"
+/* File w/userblock */
+#define FNAME16    "h5repack_ub.h5"
+#define FNAME16OUT "h5repack_ub_out.h5"
+/* Named datatypes */
+#define FNAME17     "h5repack_named_dtypes.h5"
+#define FNAME17OUT  "h5repack_named_dtypes_out.h5"
+
+#define FNAME18     "h5repack_layout2.h5"
+
+#define FNAME_UB   "ublock.bin"
+
+/* obj and region references */
+#define FNAME_REF   "h5repack_refs.h5"
+
+/* obj and region references in attr of compound and vlen type */
+#define FNAME_ATTR_REF   "h5repack_attr_refs.h5"
+
+const char *H5REPACK_FILENAMES[] = {
+    "h5repack_big_out",
+    NULL
+};
+
+#define H5REPACK_EXTFILE "h5repack_ext.bin"
+
+/* Name of tool */
+#define PROGRAMNAME "h5repacktst"
+
+
+#define DIM1    40
+#define DIM2    20
+#define CDIM1   DIM1/2
+#define CDIM2   DIM2/2
+#define RANK    2
+
+/* Size of userblock (for userblock test) */
+#define USERBLOCK_SIZE  2048
+
+/* obj and region references */
+#define NAME_OBJ_DS1 "Dset1"
+#define NAME_OBJ_GRP "Group"
+#define NAME_OBJ_NDTYPE "NamedDatatype"
+#define NAME_OBJ_DS2 "Dset2"
+#define REG_REF_DS1 "Dset_REGREF"
+
+/*-------------------------------------------------------------------------
+* prototypes
+*-------------------------------------------------------------------------
+*/
+static int make_all_objects(hid_t loc_id);
+static int make_attributes(hid_t loc_id);
+static int make_hlinks(hid_t loc_id);
+static int make_early(void);
+static int make_layout(hid_t loc_id);
+static int make_layout2(hid_t loc_id);
+static int make_layout3(hid_t loc_id);
+#ifdef H5_HAVE_FILTER_SZIP
+static int make_szip(hid_t loc_id);
+#endif /* H5_HAVE_FILTER_SZIP */
+static int make_deflate(hid_t loc_id);
+static int make_shuffle(hid_t loc_id);
+static int make_fletcher32(hid_t loc_id);
+static int make_nbit(hid_t loc_id);
+static int make_scaleoffset(hid_t loc_id);
+static int make_all_filters(hid_t loc_id);
+static int make_fill(hid_t loc_id);
+static int make_big(hid_t loc_id);
+static int make_testfiles(void);
+static int write_dset_in(hid_t loc_id,const char* dset_name,hid_t file_id,int make_diffs );
+static int write_attr_in(hid_t loc_id,const char* dset_name,hid_t fid,int make_diffs );
+static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *dset_name,hid_t tid,void *buf );
+static int make_dset(hid_t loc_id,const char *name,hid_t sid,hid_t dcpl,void *buf);
+static int make_attr(hid_t loc_id,int rank,hsize_t *dims,const char *attr_name,hid_t tid,void *buf);
+static int make_dset_reg_ref(hid_t loc_id);
+static int make_external(hid_t loc_id);
+static int make_userblock(void);
+static int verify_userblock( const char* filename);
+static int make_userblock_file(void);
+static int make_named_dtype(hid_t loc_id);
+static int make_references(hid_t loc_id);
+static int make_complex_attr_references(hid_t loc_id);
+
+
+/*-------------------------------------------------------------------------
+* Function: main
+*
+* Purpose: Executes h5repack tests
+*
+* Return: Success: zero
+*  Failure: 1
+*
+* Programmer:  Pedro Vicente <pvn@ncsa.uiuc.edu>
+*             January, 6, 2004
+*
+*-------------------------------------------------------------------------
+*/
+
+int main (void)
+{
+    pack_opt_t  pack_options;
+    diff_opt_t  diff_options;
+    hsize_t  fs_size = 0;  /* free space section threshold */
+    H5F_file_space_type_t fs_type = H5F_FILE_SPACE_DEFAULT;  /* file space handling strategy */
+    h5_stat_t		file_stat;
+    h5_stat_size_t	fsize1, fsize2;	/* file sizes */
+#if defined (H5_HAVE_FILTER_SZIP)
+    int szip_can_encode = 0;
+#endif
+
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
+
+    /* Initialize h5tools lib */
+    h5tools_init();
+
+    /* initialize */
+    HDmemset(&diff_options, 0, sizeof (diff_opt_t));
+    HDmemset(&pack_options, 0, sizeof (pack_opt_t));
+
+    /* run tests  */
+    puts("Testing h5repack:");
+
+    /* make the test files */
+    TESTING("    generating datasets");
+    if (make_testfiles() < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * Format of the tests:
+    *
+    * 1) make a copy of the file with h5repack
+    * 2) use the h5diff function to compare the input and output file
+    *-------------------------------------------------------------------------
+    */
+
+
+    /*-------------------------------------------------------------------------
+    * file with fill values
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    copy of datasets (fill values)");
+
+    /* fs_type = 0; fs_size = 0 */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME0,FNAME0OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME0,FNAME0OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME0, FNAME0OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_cmp_pl(FNAME0,FNAME0OUT)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * file with all kinds of dataset datatypes
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    copy of datasets (all datatypes)");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME1, FNAME1OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_cmp_pl(FNAME1,FNAME1OUT)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * file with attributes
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    copy of datasets (attributes)");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME2,FNAME2OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME2,FNAME2OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME2, FNAME2OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_cmp_pl(FNAME2,FNAME2OUT)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * file with hardlinks
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    copy of datasets (hardlinks)");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME3,FNAME3OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME3,FNAME3OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME3, FNAME3OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_cmp_pl(FNAME3,FNAME3OUT)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * alloc early test
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    copy of allocation early file");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME5,FNAME5OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME5,FNAME5OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME5, FNAME5OUT, &pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * the remaining files differ in the dcpl's
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * deflate
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    adding deflate filter (old_format)");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:GZIP=9",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    TESTING("    adding deflate filter (new format)");
+#ifdef H5_HAVE_FILTER_DEFLATE
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    * 	For new format, "dset1" should be using Fixed Array indexing
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, TRUE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:GZIP=9",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    adding deflate filter to all");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    /*-------------------------------------------------------------------------
+    * SZIP
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    adding szip filter");
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (h5tools_can_encode(H5Z_FILTER_SZIP) >0) {
+        szip_can_encode = 1;
+    }
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (szip_can_encode) {
+        if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+            GOERROR;
+        if (h5repack_addfilter("dset2:SZIP=8,EC",&pack_options) < 0)
+            GOERROR;
+        if (h5repack_addlayout("dset2:CHUNK=20x10",&pack_options) < 0)
+            GOERROR;
+        if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    adding szip filter to all");
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (szip_can_encode) {
+        if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+            GOERROR;
+        if (h5repack_addfilter("SZIP=8,NN",&pack_options) < 0)
+            GOERROR;
+        if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+
+    TESTING("    addding shuffle filter");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:SHUF",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    addding shuffle filter to all");
+
+    /* fs_type = H5F_FILE_SPACE_ALL_PERSIST; fs_size = 1 */
+    if (h5repack_init (&pack_options, 0, FALSE, H5_INC_ENUM(H5F_file_space_type_t, fs_type), ++fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("SHUF",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    adding checksum filter");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:FLET",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+
+
+    TESTING("    adding checksum filter to all");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("FLET",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    filter queue fletcher, shuffle, deflate, szip");
+
+    /*-------------------------------------------------------------------------
+    * add some filters
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK 20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:FLET",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:SHUF",&pack_options) < 0)
+        GOERROR;
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (szip_can_encode) {
+        if (h5repack_addfilter("dset1:SZIP=8,NN",&pack_options) < 0)
+            GOERROR;
+    }
+#endif
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+    if (h5repack_addfilter("dset1:GZIP=1",&pack_options) < 0)
+        GOERROR;
+#endif
+
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    adding layout chunked (old format)");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options )<= 0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    adding layout chunked (new format)");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    * 	For new format, "dset1" should be using Fixed Array indexing
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, TRUE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options )<= 0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    adding layout chunked to all");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    TESTING("    adding layout contiguous");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    TESTING("    adding layout contiguous to all");
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    /*-------------------------------------------------------------------------
+    * do the same test for a file with filters (chunked)
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME8, FNAME8OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+    TESTING("    adding layout compact");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:COMPA",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    adding layout compact to all");
+
+    /*-------------------------------------------------------------------------
+    * test all objects option
+    *-------------------------------------------------------------------------
+    */
+
+    /* fs_type = H5F_FILE_SPACE_ALL; fs_size = 2 */
+    if (h5repack_init (&pack_options, 0, FALSE, H5_INC_ENUM(H5F_file_space_type_t, fs_type), ++fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("COMPA",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    layout compact to contiguous conversion");
+
+    /*-------------------------------------------------------------------------
+    * layout compact to contiguous conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_compact:CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout compact to chunk conversion");
+
+    /*-------------------------------------------------------------------------
+    * layout compact to chunk conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_compact:CHUNK=2x5",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout compact to compact conversion");
+
+    /*-------------------------------------------------------------------------
+    * layout compact to compact conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_compact:COMPA",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout contiguous to compact conversion");
+    /*-------------------------------------------------------------------------
+    * layout contiguous to compact conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout contiguous to chunk conversion");
+    /*-------------------------------------------------------------------------
+    * layout contiguous to chunk conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_contiguous:CHUNK=3x6",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout contiguous to contiguous conversion");
+
+    /*-------------------------------------------------------------------------
+    * layout contiguous to contiguous conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout chunked to compact conversion");
+    /*-------------------------------------------------------------------------
+    * layout chunked to compact conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_chunk:COMPA",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout chunked to contiguous conversion");
+
+    /*-------------------------------------------------------------------------
+    * layout chunked to contiguous conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_chunk:CONTI",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    layout chunked to chunk conversion");
+    /*-------------------------------------------------------------------------
+    * layout chunked to chunked conversion
+    *-------------------------------------------------------------------------
+    */
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset_chunk:CHUNK=18x13",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * the following tests assume the input files have filters
+    * FNAME7
+    * FNAME8
+    * FNAME9
+    * FNAME10
+    * FNAME11
+    *-------------------------------------------------------------------------
+    */
+
+
+    TESTING("    copy of szip filter");
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (szip_can_encode) {
+  /* fs_type = H5F_FILE_SPACE_AGGR_VFD; fs_size = 3 */
+        if (h5repack_init (&pack_options, 0, FALSE, H5_INC_ENUM(H5F_file_space_type_t, fs_type), ++fs_size) < 0)
+            GOERROR;
+        if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME7, FNAME7OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_cmp_pl(FNAME7,FNAME7OUT)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+    TESTING("    removing szip filter");
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (szip_can_encode) {
+        if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+            GOERROR;
+        if (h5repack_addfilter("dset_szip:NONE",&pack_options) < 0)
+            GOERROR;
+        if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME7, FNAME7OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+
+    TESTING("    copy of deflate filter");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME8, FNAME8OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+
+    TESTING("    removing deflate filter");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, ++fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_deflate:NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME8, FNAME8OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+
+
+    TESTING("    copy of shuffle filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME9, FNAME9OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    removing shuffle filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_shuffle:NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME9, FNAME9OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    copy of fletcher filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME10, FNAME10OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    removing fletcher filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME10, FNAME10OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    copy of nbit filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME12, FNAME12OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    removing nbit filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_nbit:NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME12, FNAME12OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    adding nbit filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_int31:NBIT",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME12, FNAME12OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    copy of scaleoffset filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME13, FNAME13OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    removing scaleoffset filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME13, FNAME13OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    TESTING("    adding scaleoffset filter");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset_none:SOFF=31,IN",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME13, FNAME13OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * file with all filters
+    *  dset_all
+    *  dset_deflate
+    *  dset_szip
+    *  dset_shuffle
+    *  dset_fletcher32
+    *-------------------------------------------------------------------------
+    */
+
+
+    TESTING("    filter conversion from deflate to szip");
+
+#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
+
+    if (szip_can_encode) {
+  /* fs_type = H5F_FILE_SPACE_VFD; fs_size = 4 */
+        if (h5repack_init (&pack_options, 0, FALSE, H5_INC_ENUM(H5F_file_space_type_t, fs_type), ++fs_size) < 0)
+            GOERROR;
+        if (h5repack_addfilter("dset_deflate:SZIP=8,NN",&pack_options) < 0)
+            GOERROR;
+        if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME11, FNAME11OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+    TESTING("    filter conversion from szip to deflate");
+
+#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
+
+    if (szip_can_encode) {
+        if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+            GOERROR;
+        if (h5repack_addfilter("dset_szip:GZIP=1",&pack_options) < 0)
+            GOERROR;
+        if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+            GOERROR;
+        if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+            GOERROR;
+        if (h5repack_verify(FNAME11, FNAME11OUT,&pack_options)<=0)
+            GOERROR;
+        if (h5repack_end (&pack_options) < 0)
+            GOERROR;
+
+        PASSED();
+    } else {
+        SKIPPED();
+    }
+#else
+    SKIPPED();
+#endif
+
+
+    /*-------------------------------------------------------------------------
+    * test the NONE global option
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    removing all filters");
+
+#if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE)
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("NONE",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME11, FNAME11OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    /*-------------------------------------------------------------------------
+    * test a big file
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    big file");
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME14,FNAME14OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME14,FNAME14OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME14, FNAME14OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test external dataset
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    external datasets");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack(FNAME15,FNAME15OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME15,FNAME15OUT,NULL,NULL,&diff_options) > 0)
+        GOERROR;
+    if (h5repack_verify(FNAME15, FNAME15OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test file with userblock
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    file with userblock");
+    if(h5repack_init(&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if(h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
+        GOERROR;
+    if(h5diff(FNAME16, FNAME16OUT, NULL, NULL, &diff_options) > 0)
+        GOERROR;
+    if(h5repack_verify(FNAME16, FNAME16OUT, &pack_options) <= 0)
+        GOERROR;
+    if(verify_userblock(FNAME16OUT) < 0)
+        GOERROR;
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test --latest options
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    latest file format options");
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    pack_options.latest=1;
+    pack_options.grp_compact=10;
+    pack_options.grp_indexed=5;
+    pack_options.msg_size[0] = 10;
+    pack_options.msg_size[1] = 20;
+    pack_options.msg_size[2] = 30;
+    pack_options.msg_size[3] = 40;
+    pack_options.msg_size[4] = 50;
+    if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) > 0)
+        GOERROR;
+    if (h5repack_verify(FNAME1, FNAME1OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * test several global filters
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING("    several global filters");
+
+#if defined (H5_HAVE_FILTER_DEFLATE)
+
+    if (h5repack_init (&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+    if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addfilter("SHUF",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME11, FNAME11OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+
+    /*-------------------------------------------------------------------------
+    * test file with userblock
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    file with added userblock");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+
+    if(h5repack_init(&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+
+    /* add the options for a user block size and user block filename */
+    pack_options.ublock_size = USERBLOCK_SIZE;
+    pack_options.ublock_filename = FNAME_UB;
+
+    if(h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
+        GOERROR;
+    if(h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
+        GOERROR;
+    if(h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
+        GOERROR;
+    if(verify_userblock(FNAME8OUT) < 0)
+        GOERROR;
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+
+    /*-------------------------------------------------------------------------
+    * test file with aligment
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    file with aligment");
+
+#ifdef H5_HAVE_FILTER_DEFLATE
+
+    if(h5repack_init(&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+
+    /* add the options for aligment */
+    pack_options.alignment = 1;
+    pack_options.threshold = 1;
+
+    if(h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
+        GOERROR;
+    if(h5diff(FNAME8, FNAME8OUT, NULL, NULL, &diff_options) > 0)
+        GOERROR;
+    if(h5repack_verify(FNAME8, FNAME8OUT, &pack_options) <= 0)
+        GOERROR;
+
+    /* verify aligment */
+    {
+        hsize_t threshold;
+        hsize_t alignment;
+        hid_t fapl;
+        hid_t fid;
+
+        if (( fid = H5Fopen(FNAME8OUT, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 )
+            GOERROR;
+        if ((fapl = H5Fget_access_plist(fid)) < 0)
+            GOERROR;
+        if ( H5Pget_alignment(fapl, &threshold, &alignment  )  < 0)
+            GOERROR;
+        if ( threshold != 1 )
+            GOERROR;
+        if ( alignment != 1 )
+            GOERROR;
+        if ( H5Pclose(fapl) < 0)
+            GOERROR;
+        if (H5Fclose(fid) < 0)
+            GOERROR;
+
+    }
+
+
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+
+
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    /*-------------------------------------------------------------------------
+    * test file with userblock
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    file with committed datatypes");
+
+    if(h5repack_init(&pack_options, 0, FALSE, fs_type, fs_size) < 0)
+        GOERROR;
+
+    if(h5repack(FNAME17, FNAME17OUT, &pack_options) < 0)
+        GOERROR;
+    if(h5diff(FNAME17, FNAME17OUT, NULL, NULL, &diff_options) > 0)
+        GOERROR;
+    if(h5repack_verify(FNAME17, FNAME17OUT, &pack_options) <= 0)
+        GOERROR;
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test --metadata_block_size option
+    * Also verify that output file using the metadata_block_size option is
+    * larger than the output file one not using it.
+    * FNAME4 is used because it is the same as the test file used for the
+    * shell script version of this test (h5repack.sh).
+    *-------------------------------------------------------------------------
+    */
+    TESTING("    metadata block size option");
+    /* First run without metadata option. No need to verify the correctness */
+    /* since this has been verified by earlier tests. Just record the file */
+    /* size of the output file. */
+    if(h5repack_init(&pack_options, 0, FALSE, H5F_FILE_SPACE_DEFAULT, (hsize_t)0) < 0)
+        GOERROR;
+    if(h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
+        GOERROR;
+    if(HDstat(FNAME4OUT, &file_stat) < 0)
+        GOERROR;
+    fsize1 = file_stat.st_size;
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+
+    /* run it again with metadata option */
+    if(h5repack_init(&pack_options, 0, FALSE, H5F_FILE_SPACE_DEFAULT, (hsize_t)0) < 0)
+        GOERROR;
+    pack_options.meta_block_size = 8192;
+    if(h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
+        GOERROR;
+    if(h5diff(FNAME4, FNAME4OUT, NULL, NULL, &diff_options) > 0)
+        GOERROR;
+    if(h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
+        GOERROR;
+    /* record the file size of the output file */
+    if(HDstat(FNAME4OUT, &file_stat) < 0)
+        GOERROR;
+    fsize2 = file_stat.st_size;
+    /* verify second file size is larger than the first one */
+    if(fsize2 <= fsize1)
+        GOERROR;
+    if(h5repack_end(&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * clean temporary test files
+    *-------------------------------------------------------------------------
+    */
+    {
+        hid_t       fapl;
+
+        fapl = h5_fileaccess();
+        h5_clean_files(H5REPACK_FILENAMES, fapl);
+
+    }
+
+    puts("All h5repack tests passed.");
+
+    h5tools_close();
+
+    return 0;
+
+error:
+    puts("***** H5REPACK TESTS FAILED *****");
+    return 1;
+
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_testfiles
+*
+* Purpose: make a test file with all types of HDF5 objects,
+*   datatypes and filters
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_testfiles(void)
+{
+    hid_t  fid;
+
+    /*-------------------------------------------------------------------------
+    * create a file for general copy test
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME0,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_fill(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create another file for general copy test (all datatypes)
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_all_objects(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file for attributes copy test
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_attributes(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file for hard links test
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_hlinks(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file for layouts test
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME4,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_layout(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file for layout conversion test
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME18, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+
+    if(make_layout2(fid) < 0)
+        goto out;
+
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * for test layout conversions form chunk with unlimited max dims
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate("h5repack_layout3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+
+    if(make_layout3(fid) < 0)
+        goto out;
+
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file for the H5D_ALLOC_TIME_EARLY test
+    *-------------------------------------------------------------------------
+    */
+    if (make_early() < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create a file with the SZIP filter
+    *-------------------------------------------------------------------------
+    */
+#ifdef H5_HAVE_FILTER_SZIP
+    if((fid = H5Fcreate(FNAME7,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_szip(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+#endif /* H5_HAVE_FILTER_SZIP */
+
+
+    /*-------------------------------------------------------------------------
+    * create a file with the deflate filter
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME8,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_deflate(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with the shuffle filter
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME9,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_shuffle(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with the fletcher32 filter
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME10,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_fletcher32(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with all the filters
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME11,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_all_filters(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with the nbit filter
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME12,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_nbit(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with the scaleoffset filter
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME13,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_scaleoffset(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a big dataset
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME14,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_big(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with external dataset
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME15,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_external(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with userblock
+    *-------------------------------------------------------------------------
+    */
+    if(make_userblock() < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create a userblock file
+    *-------------------------------------------------------------------------
+    */
+    if(make_userblock_file() < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create a file with named datatypes
+    *-------------------------------------------------------------------------
+    */
+    if((fid = H5Fcreate(FNAME17,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_named_dtype(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create obj and region reference type datasets (bug1814)
+    * add attribute with int type (bug1726)
+    * add attribute with obj and region reference type (bug1726)
+    *-------------------------------------------------------------------------*/
+    if((fid = H5Fcreate(FNAME_REF,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    /* create reference type datasets */
+    if (make_references(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a file with obj and region references in attribute of compound and 
+    * vlen datatype
+    *-------------------------------------------------------------------------*/
+    if((fid = H5Fcreate(FNAME_ATTR_REF,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        return -1;
+    if (make_complex_attr_references(fid) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        return -1;
+
+    return 0;
+
+out:
+    H5Fclose(fid);
+    return -1;
+}
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_all_objects
+*
+* Purpose: make a test file with all types of HDF5 objects
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_all_objects(hid_t loc_id)
+{
+    hid_t   did=-1;
+    hid_t   gid=-1;
+    hid_t   tid=-1;
+    hid_t   rid=-1;
+    hid_t   sid=-1;
+    hid_t   gcplid=-1;
+    hsize_t dims[1]={2};
+    /* compound datatype */
+    typedef struct s_t
+    {
+        int    a;
+        float  b;
+    } s_t;
+
+    /*-------------------------------------------------------------------------
+    * H5G_DATASET
+    *-------------------------------------------------------------------------
+    */
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "dset_referenced", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * H5G_GROUP
+    *-------------------------------------------------------------------------
+    */
+    if ((gid  = H5Gcreate2(loc_id, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Gclose(gid) < 0)
+        goto out;
+
+    /* create a group "g2" with H5P_CRT_ORDER_TRACKED set */
+    if ((gcplid = H5Pcreate(H5P_GROUP_CREATE)) < 0)
+        goto out;
+    if (H5Pset_link_creation_order(gcplid, H5P_CRT_ORDER_TRACKED) < 0)
+        goto out;
+    if ((gid = H5Gcreate2(loc_id, "g2", H5P_DEFAULT, gcplid, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Gclose(gid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5G_TYPE
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a compound datatype */
+    if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_INT) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT) < 0)
+        goto out;
+    if (H5Tcommit2(loc_id, "type", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5G_LINK
+    *-------------------------------------------------------------------------
+    */
+
+    if (H5Lcreate_soft("dset", loc_id, "link", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5G_UDLINK
+    *-------------------------------------------------------------------------
+    */
+    /* Create an external link. Other UD links are not supported by h5repack */
+    if (H5Lcreate_external("file", "path", loc_id, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * write a series of datasetes at root
+    *-------------------------------------------------------------------------
+    */
+
+    if ((rid  = H5Gopen2(loc_id, "/", H5P_DEFAULT)) < 0)
+        goto out;
+    if (write_dset_in(rid,"dset_referenced",loc_id,0) < 0)
+        goto out;
+    if (H5Gclose(rid) < 0)
+        goto out;
+
+    /* close */
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Pclose(gcplid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Gclose(gid);
+        H5Gclose(rid);
+        H5Sclose(sid);
+        H5Tclose(tid);
+        H5Pclose(gcplid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_attributes
+*
+* Purpose: make a test file with all types of attributes
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_attributes(hid_t loc_id)
+{
+    hid_t   did=-1;
+    hid_t   gid=-1;
+    hid_t   rid=-1;
+    hid_t   sid=-1;
+    hsize_t dims[1]={2};
+
+    /*-------------------------------------------------------------------------
+    * H5G_DATASET
+    *-------------------------------------------------------------------------
+    */
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+    if ((did  = H5Dcreate2(loc_id, "dset", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5G_GROUP
+    *-------------------------------------------------------------------------
+    */
+    if ((gid  = H5Gcreate2(loc_id, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if ((rid   = H5Gopen2(loc_id, "/", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * write a series of attributes on the dataset, group, and root group
+    *-------------------------------------------------------------------------
+    */
+
+    if ( write_attr_in(did,"dset",loc_id,0) < 0)
+        goto out;
+    if (write_attr_in(gid,"dset",loc_id,0) < 0)
+        goto out;
+    if (write_attr_in(rid,"dset",loc_id,0) < 0)
+        goto out;
+
+   /* close */
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Gclose(gid) < 0)
+        goto out;
+    if (H5Gclose(rid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Gclose(gid);
+        H5Gclose(rid);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_hlinks
+*
+* Purpose: make a test file with hard links
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_hlinks(hid_t loc_id)
+{
+    hid_t   g1id=-1;
+    hid_t   g2id=-1;
+    hid_t   g3id=-1;
+    hsize_t dims[2]={3,2};
+    int     buf[3][2]= {{1,1},{1,2},{2,2}};
+
+    /*-------------------------------------------------------------------------
+    * create a dataset and some hard links to it
+    *-------------------------------------------------------------------------
+    */
+
+    if(write_dset(loc_id, 2, dims, "dset", H5T_NATIVE_INT, buf) < 0)
+        return -1;
+    if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link1 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        return -1;
+    if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link2 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        return -1;
+    if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link3 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        return -1;
+
+    /*-------------------------------------------------------------------------
+    * create a group and some hard links to it
+    *-------------------------------------------------------------------------
+    */
+
+    if((g1id = H5Gcreate2(loc_id, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if((g2id = H5Gcreate2(g1id, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if((g3id = H5Gcreate2(g2id, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    if(H5Lcreate_hard(loc_id, "g1", g2id, "link1 to g1", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    if(H5Lcreate_hard(g1id, "g2", g3id, "link1 to g2", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+
+    /* close */
+    if (H5Gclose(g1id) < 0)
+        goto out;
+    if (H5Gclose(g2id) < 0)
+        goto out;
+    if (H5Gclose(g3id) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(g1id);
+        H5Gclose(g2id);
+        H5Gclose(g3id);
+    } H5E_END_TRY;
+    return -1;
+
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_szip
+*
+* Purpose: make a dataset with the SZIP filter
+*
+*-------------------------------------------------------------------------
+*/
+#ifdef H5_HAVE_FILTER_SZIP
+static
+int make_szip(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block=8;
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+    int      szip_can_encode = 0;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dcpl */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * SZIP
+    *-------------------------------------------------------------------------
+    */
+    /* Make sure encoding is enabled */
+    if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1)
+    {
+        szip_can_encode = 1;
+    }
+    if (szip_can_encode)
+    {
+        /* set szip data */
+        if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
+            goto out;
+        if (make_dset(loc_id,"dset_szip",sid,dcpl,buf) < 0)
+            goto out;
+    }
+    else
+    {
+        /* WARNING? SZIP is decoder only, can't generate test files */
+    }
+
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+#endif /* H5_HAVE_FILTER_SZIP */
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_deflate
+*
+* Purpose: make a dataset with the deflate filter
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_deflate(hid_t loc_id)
+{
+    hid_t      dcpl; /* dataset creation property list */
+    hid_t      sid;  /* dataspace ID */
+    hsize_t    dims[RANK]={DIM1,DIM2};
+    hsize_t    chunk_dims[RANK]={CDIM1,CDIM2};
+    int        buf[DIM1][DIM2];
+    hobj_ref_t bufref[1]; /* reference */
+    hsize_t    dims1r[1]={1};
+    int        i, j, n;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dcpl */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * GZIP
+    *-------------------------------------------------------------------------
+    */
+#if defined (H5_HAVE_FILTER_DEFLATE)
+    /* set deflate data */
+    if(H5Pset_deflate(dcpl, 9) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_deflate",sid,dcpl,buf) < 0)
+        goto out;
+
+    /* create a reference to the dataset, test second seeep of file for references */
+
+    if (H5Rcreate(&bufref[0],loc_id,"dset_deflate",H5R_OBJECT,(hid_t)-1) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims1r,"ref",H5T_STD_REF_OBJ,bufref) < 0)
+        goto out;
+#endif
+
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_shuffle
+*
+* Purpose: make a dataset with the shuffle filter
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_shuffle(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dcpl */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * shuffle
+    *-------------------------------------------------------------------------
+    */
+
+    /* set the shuffle filter */
+    if (H5Pset_shuffle(dcpl) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_shuffle",sid,dcpl,buf) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_fletcher32
+*
+* Purpose: make a dataset with the fletcher32 filter
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_fletcher32(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * fletcher32
+    *-------------------------------------------------------------------------
+    */
+
+    /* remove the filters from the dcpl */
+    if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
+        goto out;
+    /* set the checksum filter */
+    if (H5Pset_fletcher32(dcpl) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_fletcher32",sid,dcpl,buf) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_nbit
+*
+* Purpose: make a dataset with the nbit filter
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_nbit(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    hid_t    dtid;
+    hid_t    dsid;
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    dtid = H5Tcopy(H5T_NATIVE_INT);
+    if (H5Tset_precision(dtid,(H5Tget_precision(dtid) - 1)) < 0)
+    {
+        H5Tclose(dtid);
+        goto out;
+    }
+
+    /* remove the filters from the dcpl */
+    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
+    {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Pset_nbit(dcpl) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    H5Dclose(dsid);
+
+    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if((dsid = H5Dcreate2(loc_id, "dset_int31", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    H5Dclose(dsid);
+
+    /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+    if (H5Tclose(dtid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_scaleoffset
+*
+* Purpose: make a dataset with the scaleoffset filter
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_scaleoffset(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    hid_t    dtid;
+    hid_t    dsid;
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    dtid = H5Tcopy(H5T_NATIVE_INT);
+
+    /* remove the filters from the dcpl */
+    if(H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Pset_scaleoffset(dcpl, H5Z_SO_INT, 31) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if((dsid = H5Dcreate2(loc_id, "dset_scaleoffset", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    H5Dclose(dsid);
+    if((dsid = H5Dcreate2(loc_id, "dset_none", dtid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) {
+        H5Tclose(dtid);
+        goto out;
+    }
+    H5Tclose(dtid);
+    H5Dclose(dsid);
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_all_filters
+*
+* Purpose: make a file with all filters
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_all_filters(hid_t loc_id)
+{
+    hid_t    dcpl; /* dataset creation property list */
+    hid_t    sid;  /* dataspace ID */
+    hid_t    dtid;
+    hid_t    dsid;
+#if defined (H5_HAVE_FILTER_SZIP)
+    unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
+    unsigned szip_pixels_per_block=8;
+#endif /* H5_HAVE_FILTER_SZIP */
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+#if defined (H5_HAVE_FILTER_SZIP)
+    int szip_can_encode = 0;
+#endif
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    /* set up chunk */
+    if (H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+
+    /* set the shuffle filter */
+    if (H5Pset_shuffle(dcpl) < 0)
+        goto out;
+
+    /* set the checksum filter */
+    if (H5Pset_fletcher32(dcpl) < 0)
+        goto out;
+
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1)
+    {
+        szip_can_encode = 1;
+    }
+    if (szip_can_encode)
+    {
+        /* set szip data */
+        if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
+            goto out;
+    } else {
+        /* WARNING? SZIP is decoder only, can't generate test data using szip */
+    }
+#endif
+
+#if defined (H5_HAVE_FILTER_DEFLATE)
+    /* set deflate data */
+    if(H5Pset_deflate(dcpl, 9) < 0)
+        goto out;
+#endif
+
+    if (make_dset(loc_id,"dset_all",sid,dcpl,buf) < 0)
+        goto out;
+
+    /* remove the filters from the dcpl */
+    if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
+        goto out;
+    /* set the checksum filter */
+    if (H5Pset_fletcher32(dcpl) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_fletcher32",sid,dcpl,buf) < 0)
+        goto out;
+
+
+    /* Make sure encoding is enabled */
+#if defined (H5_HAVE_FILTER_SZIP)
+    if (szip_can_encode)
+    {
+        /* remove the filters from the dcpl */
+        if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
+            goto out;
+        /* set szip data */
+        if(H5Pset_szip (dcpl,szip_options_mask,szip_pixels_per_block) < 0)
+            goto out;
+        if (make_dset(loc_id,"dset_szip",sid,dcpl,buf) < 0)
+            goto out;
+    } else
+    {
+        /* WARNING? SZIP is decoder only, can't generate test dataset */
+    }
+#endif
+
+
+    /* remove the filters from the dcpl */
+    if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
+        goto out;
+    /* set the shuffle filter */
+    if (H5Pset_shuffle(dcpl) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_shuffle",sid,dcpl,buf) < 0)
+        goto out;
+
+
+#if defined (H5_HAVE_FILTER_DEFLATE)
+    /* remove the filters from the dcpl */
+    if (H5Premove_filter(dcpl,H5Z_FILTER_ALL) < 0)
+        goto out;
+    /* set deflate data */
+    if(H5Pset_deflate(dcpl, 1) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_deflate",sid,dcpl,buf) < 0)
+        goto out;
+#endif
+
+
+
+    /* remove the filters from the dcpl */
+    if (H5Premove_filter(dcpl, H5Z_FILTER_ALL) < 0)
+        goto out;
+    /* set the shuffle filter */
+    if (H5Pset_nbit(dcpl) < 0)
+        goto out;
+    if ((dtid = H5Tcopy(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if (H5Tset_precision(dtid, (H5Tget_precision(dtid) - 1)) < 0)
+        goto out;
+    if((dsid = H5Dcreate2(loc_id, "dset_nbit", dtid, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Dwrite(dsid, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+        goto out;
+
+    /* close */
+    if(H5Tclose(dtid) < 0)
+        return -1;
+    if(H5Dclose(dsid) < 0)
+        return -1;
+
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_early
+*
+* Purpose: create a file for the H5D_ALLOC_TIME_EARLY test
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_early(void)
+{
+    hsize_t dims[1] ={3000};
+    hsize_t cdims[1]={30};
+    hid_t   fid=-1;
+    hid_t   did=-1;
+    hid_t   sid=-1;
+    hid_t   tid=-1;
+    hid_t   dcpl=-1;
+    int     i;
+    char    name[10];
+    int     iter=100;
+
+    if ((fid = H5Fcreate(FNAME5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+    if (H5Fclose(fid) < 0)
+        goto out;
+
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if (H5Pset_chunk(dcpl, 1, cdims) < 0)
+        goto out;
+    if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+        goto out;
+
+    for(i = 0; i < iter; i++)
+    {
+        if ((fid = H5Fopen(FNAME5, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+            goto out;
+        if ((did = H5Dcreate2(fid, "early", H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+            goto out;
+        if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            goto out;
+        sprintf(name, "%d", i);
+        if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Dclose(did) < 0)
+            goto out;
+        if (H5Ldelete(fid, "early", H5P_DEFAULT) < 0)
+            goto out;
+        if (H5Fclose(fid) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * do the same without close/opening the file and creating the dataset
+    *-------------------------------------------------------------------------
+    */
+
+    if ((fid = H5Fcreate(FNAME6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        return -1;
+
+    for(i = 0; i < iter; i++)
+    {
+        if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
+            goto out;
+        sprintf(name, "%d", i);
+        if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+    }
+
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (H5Pclose(dcpl) < 0)
+        goto out;
+    if (H5Fclose(fid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(tid);
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_layout
+*
+* Purpose: make several datasets with several layouts in location LOC_ID
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_layout(hid_t loc_id)
+{
+    hid_t    dcpl=-1; /* dataset creation property list */
+    hid_t    sid=-1;  /* dataspace ID */
+    hsize_t  dims[RANK]={DIM1,DIM2};
+    hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
+    int      buf[DIM1][DIM2];
+    int      i, j, n;
+    char     name[6];
+
+
+    for (i=n=0; i<DIM1; i++)
+    {
+        for (j=0; j<DIM2; j++)
+        {
+            buf[i][j]=n++;
+        }
+    }
+
+    /*-------------------------------------------------------------------------
+    * make several dataset with no filters
+    *-------------------------------------------------------------------------
+    */
+    for (i=0; i<4; i++)
+    {
+        sprintf(name,"dset%d",i+1);
+        if (write_dset(loc_id,RANK,dims,name,H5T_NATIVE_INT,buf) < 0)
+            return -1;
+    }
+
+
+    /*-------------------------------------------------------------------------
+    * make several dataset with several layout options
+    *-------------------------------------------------------------------------
+    */
+    /* create a space */
+    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    {
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5D_COMPACT
+    *-------------------------------------------------------------------------
+    */
+    if(H5Pset_layout (dcpl,H5D_COMPACT) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_compact",sid,dcpl,buf) < 0)
+    {
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5D_CONTIGUOUS
+    *-------------------------------------------------------------------------
+    */
+    if(H5Pset_layout (dcpl,H5D_CONTIGUOUS) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_contiguous",sid,dcpl,buf) < 0)
+    {
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5D_CHUNKED
+    *-------------------------------------------------------------------------
+    */
+    if(H5Pset_chunk(dcpl, RANK, chunk_dims) < 0)
+        goto out;
+    if (make_dset(loc_id,"dset_chunk",sid,dcpl,buf) < 0)
+    {
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+/*-------------------------------------------------------------------------
+ * Function: make_layout2
+ *
+ * Purpose: create datasets with contiguous and chunked layouts:
+ *
+ *  contig_small: < 1k, fixed dims datspace
+ *  chunked_small_fixed: < 1k, fixed dims dataspace
+ *
+ *-------------------------------------------------------------------------
+ */
+#define S_DIM1  4
+#define S_DIM2  10
+#define CONTIG_S  "contig_small"
+#define CHUNKED_S_FIX  "chunked_small_fixed"
+
+static
+int make_layout2(hid_t loc_id)
+{
+
+    hid_t    contig_dcpl = -1;   /* dataset creation property list */
+    hid_t    chunked_dcpl = -1; /* dataset creation property list */
+
+    int      i, j, n;    /* Local index variables */
+    int       ret_value = -1;  /* Return value */
+    hid_t    s_sid = -1;  /* dataspace ID */
+
+    hsize_t  s_dims[RANK] = {S_DIM1,S_DIM2};  /* Dataspace (< 1 k) */
+    hsize_t  chunk_dims[RANK] = {S_DIM1/2, S_DIM2/2};  /* Dimension sizes for chunks */
+
+    int      s_buf[S_DIM1][S_DIM2];  /* Temporary buffer */
+
+    for(i = n = 0; i < S_DIM1; i++) {
+        for (j = 0; j < S_DIM2; j++) {
+            s_buf[i][j] = n++;
+        }
+    }
+
+    /* Create dataspaces */
+    if((s_sid = H5Screate_simple(RANK, s_dims, NULL)) < 0)
+        goto out;
+
+    /* Create contiguous datasets */
+    if((contig_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_layout(contig_dcpl, H5D_CONTIGUOUS) < 0)
+        goto out;
+    if(make_dset(loc_id, CONTIG_S, s_sid, contig_dcpl, s_buf) < 0)
+        goto out;
+
+    /* Create chunked datasets */
+    if((chunked_dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_chunk(chunked_dcpl, RANK, chunk_dims) < 0)
+        goto out;
+    if(make_dset(loc_id, CHUNKED_S_FIX, s_sid, chunked_dcpl, s_buf) < 0)
+        goto out;
+
+    ret_value = 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(contig_dcpl);
+        H5Pclose(chunked_dcpl);
+    
+        H5Sclose(s_sid);
+
+    } H5E_END_TRY;
+
+    return(ret_value);
+
+} /* make_layout2() */
+
+/*-------------------------------------------------------------------------
+* Function: make_layout3
+*
+* Purpose: make chunked datasets with unlimited max dim and chunk dim is
+*          bigger than current dim. (HDFFV-7933)
+*          Test for converting chunk to chunk , chunk to conti and chunk
+*          to compact.  
+*          - The chunk to chunk changes layout bigger than any current dim 
+*            again. 
+*          - The chunk to compact test dataset bigger than 64K, should
+*            remain original layout.*
+*
+*-------------------------------------------------------------------------
+*/
+#define DIM1_L3 300
+#define DIM2_L3 200
+/* small size */
+#define SDIM1_L3 4
+#define SDIM2_L3 50
+static
+int make_layout3(hid_t loc_id)
+{
+    hid_t    dcpl1=-1; /* dataset creation property list */
+    hid_t    dcpl2=-1; /* dataset creation property list */
+    hid_t    dcpl3=-1; /* dataset creation property list */
+    hid_t    sid1=-1;  /* dataspace ID */
+    hid_t    sid2=-1;  /* dataspace ID */
+    hsize_t  dims1[RANK]={DIM1_L3,DIM2_L3};
+    hsize_t  dims2[RANK]={SDIM1_L3,SDIM2_L3};
+    hsize_t  maxdims[RANK]={H5S_UNLIMITED, H5S_UNLIMITED};
+    hsize_t  chunk_dims1[RANK]={DIM1_L3*2,5};
+    hsize_t  chunk_dims2[RANK]={SDIM1_L3 + 2, SDIM2_L3/2};
+    hsize_t  chunk_dims3[RANK]={SDIM1_L3 - 2, SDIM2_L3/2};
+    int      buf1[DIM1_L3][DIM2_L3];
+    int      buf2[SDIM1_L3][SDIM2_L3];
+    int      i, j, n;
+
+    /* init buf1 */
+    for (i=n=0; i<DIM1_L3; i++)
+    {
+        for (j=0; j<DIM2_L3; j++)
+        {
+            buf1[i][j]=n++;
+        }
+    }
+
+    /* init buf2 */
+    for (i=n=0; i<SDIM1_L3; i++)
+    {
+        for (j=0; j<SDIM2_L3; j++)
+        {
+            buf2[i][j]=n++;
+        }
+    }
+
+    /*-------------------------------------------------------------------------
+    * make chunked dataset with
+    *  - dset maxdims are UNLIMIT
+    *  - a chunk dim is bigger than dset dim
+    *  - dset size bigger than compact max (64K)
+    *-------------------------------------------------------------------------
+    */
+    /* create a space */
+    if((sid1 = H5Screate_simple(RANK, dims1, maxdims)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl1 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    {
+        goto out;
+    }
+
+    if(H5Pset_chunk(dcpl1, RANK, chunk_dims1) < 0)
+        goto out;
+    if (make_dset(loc_id,"chunk_unlimit1",sid1,dcpl1,buf1) < 0)
+    {
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * make chunked dataset with
+    *  - dset maxdims are UNLIMIT
+    *  - a chunk dim is bigger than dset dim
+    *  - dset size smaller than compact (64K)
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a space */
+    if((sid2 = H5Screate_simple(RANK, dims2, maxdims)) < 0)
+        return -1;
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl2 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+
+    if(H5Pset_chunk(dcpl2, RANK, chunk_dims2) < 0)
+        goto out;
+
+    if (make_dset(loc_id,"chunk_unlimit2",sid2,dcpl2,buf2) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * make chunked dataset with
+    *  - dset maxdims are UNLIMIT
+    *  - a chunk dims are smaller than dset dims
+    *  - dset size smaller than compact (64K)
+    *-------------------------------------------------------------------------
+    */
+    /* create a dataset creation property list; the same DCPL is used for all dsets */
+    if ((dcpl3 = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+
+    if(H5Pset_chunk(dcpl3, RANK, chunk_dims3) < 0)
+        goto out;
+
+    if (make_dset(loc_id,"chunk_unlimit3",sid2,dcpl3,buf2) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * close space and dcpl
+    *-------------------------------------------------------------------------
+    */
+    if(H5Sclose(sid1) < 0)
+        goto out;
+    if(H5Sclose(sid2) < 0)
+        goto out;
+    if(H5Pclose(dcpl1) < 0)
+        goto out;
+    if(H5Pclose(dcpl2) < 0)
+        goto out;
+    if(H5Pclose(dcpl3) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Sclose(sid1);
+        H5Sclose(sid2);
+        H5Pclose(dcpl1);
+        H5Pclose(dcpl2);
+        H5Pclose(dcpl3);
+    } H5E_END_TRY;
+    return -1;
+}
+
+/*-------------------------------------------------------------------------
+* Function: make a file with an integer dataset with a fill value
+*
+* Purpose: test copy of fill values
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_fill(hid_t loc_id)
+{
+    hid_t   did=-1;
+    hid_t   sid=-1;
+    hid_t   dcpl;
+    hsize_t dims[2]={3,2};
+    int     buf[3][2]= {{1,1},{1,2},{2,2}};
+    int     fillvalue = 2;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER, write a fill value
+    *-------------------------------------------------------------------------
+    */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_fill_value(dcpl, H5T_NATIVE_INT, &fillvalue) < 0)
+        goto out;
+    if((sid = H5Screate_simple(2,dims,NULL)) < 0)
+        goto out;
+    if((did = H5Dcreate2(loc_id, "dset_fill", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+        goto out;
+
+    /* close */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+        H5Dclose(did);
+    } H5E_END_TRY;
+    return -1;
+
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_big
+*
+* Purpose: used in test read by hyperslabs. Creates a 128MB dataset.
+*  Only 1 1024Kb hyperslab is written.
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_big(hid_t loc_id)
+{
+    hid_t   did=-1;
+    hid_t   f_sid=-1;
+    hid_t   m_sid=-1;
+    hid_t   tid;
+    hid_t   dcpl;
+    hsize_t dims[1]={ H5TOOLS_MALLOCSIZE + 1}; /* dataset dimensions */
+    hsize_t hs_size[1];                     /* hyperslab dimensions */
+    hsize_t hs_start[1];                    /* hyperslab start */
+    hsize_t chunk_dims[1]={1024};           /* chunk dimensions */
+    size_t  size;
+    size_t  nelmts=(size_t)1024;
+    signed  char fillvalue=-1;
+    signed  char *buf=NULL;
+
+    /* write one 1024 byte hyperslab */
+    hs_start[0] = 0;
+    hs_size[0]  = 1024;
+
+    /* create */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_fill_value(dcpl, H5T_NATIVE_SCHAR, &fillvalue) < 0)
+        goto out;
+    if(H5Pset_chunk(dcpl, 1, chunk_dims) < 0)
+        goto out;
+    if((f_sid = H5Screate_simple(1,dims,NULL)) < 0)
+        goto out;
+    if((did = H5Dcreate2(loc_id, "dset", H5T_NATIVE_SCHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto out;
+    if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
+        goto out;
+    if((tid = H5Dget_type(did)) < 0)
+        goto out;
+    if((size = H5Tget_size(tid))<=0)
+        goto out;
+
+    /* initialize buffer to 0  */
+    buf=(signed  char *) HDcalloc( nelmts, size);
+
+    if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
+        goto out;
+    if (H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
+        goto out;
+
+    HDfree(buf);
+    buf=NULL;
+
+    /* close */
+    if(H5Sclose(f_sid) < 0)
+        goto out;
+    if(H5Sclose(m_sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(dcpl);
+        H5Sclose(f_sid);
+        H5Sclose(m_sid);
+        H5Dclose(did);
+    } H5E_END_TRY;
+    return -1;
+
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_external
+*
+* Purpose: create a external dataset
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_external(hid_t loc_id)
+{
+    hid_t   did=-1;
+    hid_t   sid=-1;
+    hid_t   dcpl;
+    int     buf[2]={1,2};
+    hsize_t cur_size[1];    /* data space current size  */
+    hsize_t max_size[1];    /* data space maximum size  */
+    hsize_t size;
+
+    cur_size[0] = max_size[0] = 2;
+    size = max_size[0] * sizeof(int);
+
+    /* create */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_external(dcpl, H5REPACK_EXTFILE, (off_t)0, size) < 0)
+        goto out;
+    if((sid = H5Screate_simple(1,cur_size, max_size)) < 0)
+        goto out;
+    if((did = H5Dcreate2(loc_id, "external", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+        goto out;
+
+    /* close */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Pclose(dcpl);
+        H5Sclose(sid);
+        H5Dclose(did);
+    } H5E_END_TRY;
+    return -1;
+
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_userblock
+*
+* Purpose: create a file for the userblock copying test
+*
+*-------------------------------------------------------------------------
+*/
+static int
+make_userblock(void)
+{
+    hid_t   fid = -1;
+    hid_t   fcpl = -1;
+    int     fd = -1;            /* File descriptor for writing userblock */
+    char    ub[USERBLOCK_SIZE]; /* User block data */
+    ssize_t nwritten;           /* # of bytes written */
+    size_t  u;                  /* Local index variable */
+
+    /* Create file creation property list with userblock set */
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+        goto out;
+    if(H5Pset_userblock(fcpl, (hsize_t)USERBLOCK_SIZE) < 0)
+        goto out;
+
+    /* Create file with userblock */
+    if((fid = H5Fcreate(FNAME16, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Fclose(fid) < 0)
+        goto out;
+
+    /* Close file creation property list */
+    if(H5Pclose(fcpl) < 0)
+        goto out;
+
+
+    /* Initialize userblock data */
+    for(u = 0; u < USERBLOCK_SIZE; u++)
+        ub[u] = (char)('a' + (char)(u % 26));
+
+    /* Re-open HDF5 file, as "plain" file */
+    if((fd = HDopen(FNAME16, O_WRONLY, 0644)) < 0)
+        goto out;
+
+    /* Write userblock data */
+    nwritten = HDwrite(fd, ub, (size_t)USERBLOCK_SIZE);
+    HDassert(nwritten == USERBLOCK_SIZE);
+
+    /* Close file */
+    HDclose(fd);
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(fcpl);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    if(fd > 0)
+        HDclose(fd);
+
+    return -1;
+} /* end make_userblock() */
+
+/*-------------------------------------------------------------------------
+* Function: verify_userblock
+*
+* Purpose: Verify that the userblock was copied correctly
+*
+*-------------------------------------------------------------------------
+*/
+static int
+verify_userblock( const char* filename)
+{
+    hid_t   fid = -1;
+    hid_t   fcpl = -1;
+    int     fd = -1;            /* File descriptor for writing userblock */
+    char    ub[USERBLOCK_SIZE]; /* User block data */
+    hsize_t ub_size = 0;        /* User block size */
+    ssize_t nread;              /* # of bytes read */
+    size_t  u;                  /* Local index variable */
+
+    /* Open file with userblock */
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* Retrieve file creation property list & userblock size */
+    if((fcpl = H5Fget_create_plist(fid)) < 0)
+        goto out;
+    if(H5Pget_userblock(fcpl, &ub_size) < 0)
+        goto out;
+
+    /* Verify userblock size is correct */
+    if(ub_size != USERBLOCK_SIZE)
+        goto out;
+
+    /* Close file creation property list */
+    if(H5Pclose(fcpl) < 0)
+        goto out;
+
+    if(H5Fclose(fid) < 0)
+        goto out;
+
+
+    /* Re-open HDF5 file, as "plain" file */
+    if((fd = HDopen(filename, O_RDONLY, 0)) < 0)
+        goto out;
+
+    /* Read userblock data */
+    nread = HDread(fd, ub, (size_t)USERBLOCK_SIZE);
+    HDassert(nread == USERBLOCK_SIZE);
+
+    /* Verify userblock data */
+    for(u = 0; u < USERBLOCK_SIZE; u++)
+        if(ub[u] != (char)('a' + (u % 26)))
+            goto out;
+
+    /* Close file */
+    HDclose(fd);
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(fcpl);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    if(fd > 0)
+        HDclose(fd);
+
+    return -1;
+} /* end verify_userblock() */
+
+
+/*-------------------------------------------------------------------------
+* Function: make_userblock_file
+*
+* Purpose: create a file for the userblock add test
+*
+*-------------------------------------------------------------------------
+*/
+static int
+make_userblock_file(void)
+{
+    int     fd = -1;            /* File descriptor for writing userblock */
+    char    ub[USERBLOCK_SIZE]; /* User block data */
+    ssize_t nwritten;           /* # of bytes written */
+    size_t  u;                  /* Local index variable */
+
+    /* initialize userblock data */
+    for(u = 0; u < USERBLOCK_SIZE; u++)
+        ub[u] = (char)('a' + (char)(u % 26));
+
+    /* open file */
+    if((fd = HDopen(FNAME_UB,O_WRONLY|O_CREAT|O_TRUNC, 0644 )) < 0)
+        goto out;
+
+    /* write userblock data */
+    nwritten = HDwrite(fd, ub, (size_t)USERBLOCK_SIZE);
+    HDassert(nwritten == USERBLOCK_SIZE);
+
+    /* close file */
+    HDclose(fd);
+
+    return 0;
+
+out:
+
+    if(fd > 0)
+        HDclose(fd);
+
+    return -1;
+}
+
+/*-------------------------------------------------------------------------
+* Function: write_dset_in
+*
+* Purpose: write datasets in LOC_ID
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 12, 2003
+*
+*-------------------------------------------------------------------------
+*/
+static
+int write_dset_in(hid_t loc_id,
+                   const char* dset_name, /* for saving reference to dataset*/
+                   hid_t file_id,
+                   int make_diffs /* flag to modify data buffers */)
+{
+    /* compound datatype */
+    typedef struct s_t
+    {
+        char   a;
+        double b;
+    } s_t;
+
+    typedef enum
+    {
+        RED,
+        GREEN
+    } e_t;
+
+    hid_t   did=-1;
+    hid_t   sid=-1;
+    hid_t   tid=-1;
+    hid_t   pid=-1;
+    unsigned i, j;
+    int     val, k, n;
+    float   f;
+
+    /* create 1D attributes with dimension [2], 2 elements */
+    hsize_t    dims[1]={2};
+    hsize_t    dims1r[1]={2};
+    char       buf1[2][3]= {"ab","de"};        /* string */
+    char       buf2[2]= {1,2};                 /* bitfield, opaque */
+    s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
+    hobj_ref_t buf4[2];                        /* reference */
+    e_t        buf45[2]= {RED,GREEN};          /* enum */
+    hvl_t      buf5[2];                        /* vlen */
+    hsize_t    dimarray[1]={3};                /* array dimension */
+    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
+    int        buf7[2]= {1,2};                 /* integer */
+    float      buf8[2]= {1,2};                 /* float */
+
+    /* create 2D attributes with dimension [3][2], 6 elements */
+    hsize_t    dims2[2]={3,2};
+    hsize_t    dims2r[2]={1,1};
+    char       buf12[6][3]= {"ab","cd","ef","gh","ij","kl"};         /* string */
+    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
+    s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
+    hobj_ref_t buf42[1][1];                                          /* reference */
+    hvl_t      buf52[3][2];                                          /* vlen */
+    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
+    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
+    float      buf82[3][2]= {{1,2},{3,4},{5,6}};                     /* float */
+
+    /* create 3D attributes with dimension [4][3][2], 24 elements */
+    hsize_t    dims3[3]={4,3,2};
+    hsize_t    dims3r[3]={1,1,1};
+    char       buf13[24][3]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
+    char       buf23[4][3][2];    /* bitfield, opaque */
+    s_t        buf33[4][3][2];    /* compound */
+    hobj_ref_t buf43[1][1][1];    /* reference */
+    hvl_t      buf53[4][3][2];    /* vlen */
+    int        buf63[24][3];      /* array */
+    int        buf73[4][3][2];    /* integer */
+    float      buf83[4][3][2];    /* float */
+
+
+    /*-------------------------------------------------------------------------
+    * 1D
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            for(j = 0; j < 2; j++)
+                buf1[i][j] = 'z';
+    }
+
+
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"string",tid,buf1) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+
+    /* create hard link */
+    if (H5Lcreate_hard(loc_id, "string", H5L_SAME_LOC, "string_link", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            buf2[i] = buf2[1] = 0;
+    }
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"bitfield",tid,buf2) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++) {
+            buf3[i].a = 0;
+            buf3[i].b = 0;
+        }
+    }
+
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"opaque",tid,buf2) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            buf45[i] = GREEN;
+    }
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"compound",tid,buf3) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* object references ( H5R_OBJECT ) */
+    buf4[0]=0;
+    buf4[1]=0;
+    if (dset_name)
+    {
+        if (H5Rcreate(&buf4[0],file_id,dset_name,H5R_OBJECT,(hid_t)-1) < 0)
+            goto out;
+        if (write_dset(loc_id,1,dims1r,"refobj",H5T_STD_REF_OBJ,buf4) < 0)
+            goto out;
+    }
+
+    /* Dataset region reference ( H5R_DATASET_REGION  )  */
+    if (make_dset_reg_ref(loc_id) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"enum",tid,buf45) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+
+    buf5[0].len = 1;
+    buf5[0].p = HDmalloc( 1 * sizeof(int));
+    ((int *)buf5[0].p)[0]=1;
+    buf5[1].len = 2;
+    buf5[1].p = HDmalloc( 2 * sizeof(int));
+    ((int *)buf5[1].p)[0] = 2;
+    ((int *)buf5[1].p)[1] = 3;
+
+    if(make_diffs) {
+        ((int *)buf5[0].p)[0] = 0;
+        ((int *)buf5[1].p)[0] = 0;
+        ((int *)buf5[1].p)[1] = 0;
+    }
+
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5) < 0)
+        goto out;
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
+        goto out;
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++)
+            for(j = 0; j < 3; j++)
+                buf6[i][j] = 0;
+    }
+
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (write_dset(loc_id, 1, dims, "array", tid, buf6) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    {
+
+        hsize_t TEST_BUFSIZE = (128 * 1024 * 1024);  /* 128MB */
+        double   *dbuf;                           /* information to write */
+        size_t   size;
+        hsize_t  sdims[] = {1};
+        hsize_t  tdims[] = {TEST_BUFSIZE / sizeof(double) + 1};
+        unsigned u;
+
+        /* allocate and initialize array data to write */
+        size = ( TEST_BUFSIZE / sizeof(double) + 1 ) * sizeof(double);
+        dbuf = (double*)HDmalloc( size );
+        if (NULL == dbuf)
+        {
+            printf ("\nError: Cannot allocate memory for \"arrayd\" data buffer size %dMB.\n", (int) size / 1000000 );
+            goto out;
+        }
+
+        for( u = 0; u < TEST_BUFSIZE / sizeof(double) + 1; u++)
+            dbuf[u] = u;
+
+        if (make_diffs)
+        {
+            dbuf[5] = 0;
+            dbuf[6] = 0;
+        }
+
+        /* create a type larger than TEST_BUFSIZE */
+        if ((tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, tdims)) < 0)
+            goto out;
+        size = H5Tget_size(tid);
+        if ((sid = H5Screate_simple(1, sdims, NULL)) < 0)
+            goto out;
+        if ((did = H5Dcreate2(loc_id, "arrayd", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+#if defined(WRITE_ARRAY)
+        H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dbuf);
+#endif
+
+        /* close */
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+        HDfree( dbuf );
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs) {
+        for(i = 0; i < 2; i++) {
+            buf7[i] = 0;
+            buf8[i] = 0;
+        }
+    }
+
+    if (write_dset(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7) < 0)
+        goto out;
+    if (write_dset(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * 2D
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf12, 'z', sizeof buf12);
+    }
+
+
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (write_dset(loc_id,2,dims2,"string2D",tid,buf12) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+
+    if (make_diffs)
+    {
+        HDmemset(buf22,0,sizeof buf22);
+    }
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (write_dset(loc_id,2,dims2,"bitfield2D",tid,buf22) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (write_dset(loc_id,2,dims2,"opaque2D",tid,buf22) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf32,0,sizeof buf32);
+    }
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (write_dset(loc_id,2,dims2,"compound2D",tid,buf32) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* Create references to dataset */
+    if (dset_name)
+    {
+        if (H5Rcreate(&buf42[0][0], file_id, dset_name, H5R_OBJECT, (hid_t)-1) < 0)
+            goto out;
+        if (write_dset(loc_id, 2, dims2r, "refobj2D", H5T_STD_REF_OBJ, buf42) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (write_dset(loc_id,2,dims2,"enum2D",tid,0) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            unsigned l;
+
+            buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for(l = 0; l < i + 1; l++) {
+                if(make_diffs)
+                    ((int *)buf52[i][j].p)[l] = 0;
+                else
+                    ((int *)buf52[i][j].p)[l] = n++;
+            }
+        }
+    }
+
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf52) < 0)
+        goto out;
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
+        goto out;
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf62,0,sizeof buf62);
+    }
+
+
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (write_dset(loc_id, 2, dims2, "array2D", tid, buf62) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER, write a fill value
+    *-------------------------------------------------------------------------
+    */
+
+
+    if(make_diffs) {
+        HDmemset(buf72, 0, sizeof buf72);
+        HDmemset(buf82, 0, sizeof buf82);
+    }
+
+
+    if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "integer2D", H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf72) < 0)
+        goto out;
+    if (H5Pclose(pid) < 0)
+        goto out;
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+
+    if (write_dset(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * 3D
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf13,'z',sizeof buf13);
+    }
+
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"string3D",tid,buf13) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+
+    n=1;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else 
+                    buf23[i][j][k] = (char)(n++);
+            }
+        }
+    }
+
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"bitfield3D",tid,buf23) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"opaque3D",tid,buf23) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    n=1;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0;
+                }
+                else {
+                    buf33[i][j][k].a = (char)(n++);
+                    buf33[i][j][k].b = n++;
+                }
+            }
+        }
+    }
+
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"compound3D",tid,buf33) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* Create references to dataset */
+    if (dset_name)
+    {
+        if (H5Rcreate(&buf43[0][0][0], file_id, dset_name, H5R_OBJECT, (hid_t)-1) < 0)
+            goto out;
+        if (write_dset(loc_id, 3, dims3r, "refobj3D", H5T_STD_REF_OBJ, buf43) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"enum3D",tid,0) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+    n = 0;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                unsigned l;
+
+                buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)(i + 1);
+                for(l = 0; l < i + 1; l++) {
+                    if(make_diffs)
+                        ((int *)buf53[i][j][k].p)[l] = 0;
+                    else
+                        ((int *)buf53[i][j][k].p)[l] = n++;
+                }
+            }
+        }
+    }
+
+    if ((sid = H5Screate_simple(3, dims3, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf53) < 0)
+        goto out;
+
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
+        goto out;
+
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+
+    n = 1;
+    for(i = 0; i < 24; i++) {
+        for(j = 0; j < dimarray[0]; j++) {
+            if(make_diffs)
+                buf63[i][j] = 0;
+            else
+                buf63[i][j] = n++;
+        }
+    }
+
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (write_dset(loc_id, 3, dims3, "array3D", tid, buf63) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+    n=1; f=1;
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 3; j++) {
+            for (k = 0; k < 2; k++) {
+                if (make_diffs) {
+                    buf73[i][j][k]=0;
+                    buf83[i][j][k]=0;
+                }
+                else {
+                    buf73[i][j][k]=n++;
+                    buf83[i][j][k]=f++;
+                }
+            }
+        }
+    }
+    if (write_dset(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73) < 0)
+        goto out;
+    if (write_dset(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Pclose(pid);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_dset_reg_ref
+*
+* Purpose: write dataset region references
+*
+*-------------------------------------------------------------------------
+*/
+
+#define SPACE1_RANK 1
+#define SPACE1_DIM1 1
+#define SPACE2_RANK 2
+#define SPACE2_DIM1 10
+#define SPACE2_DIM2 10
+static
+int make_dset_reg_ref(hid_t loc_id)
+{
+    hid_t           did1=-1; /* Dataset ID   */
+    hid_t           did2=-1; /* Dereferenced dataset ID */
+    hid_t           sid1=-1;  /* Dataspace ID #1  */
+    hid_t           sid2=-1;  /* Dataspace ID #2  */
+    hsize_t         dims1[] = {SPACE1_DIM1};
+    hsize_t         dims2[] = {SPACE2_DIM1, SPACE2_DIM2};
+    hsize_t         start[SPACE2_RANK];     /* Starting location of hyperslab */
+    hsize_t         stride[SPACE2_RANK];    /* Stride of hyperslab */
+    hsize_t         count[SPACE2_RANK];     /* Element count of hyperslab */
+    hsize_t         block[SPACE2_RANK];     /* Block size of hyperslab */
+    hdset_reg_ref_t *wbuf=NULL;  /* buffer to write to disk */
+    int             *dwbuf=NULL; /* Buffer for writing numeric data to disk */
+    int             i;      /* counting variables */
+    int             retval = -1;  /* return value */
+
+    /* Allocate write & read buffers */
+    wbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)SPACE1_DIM1);
+    dwbuf = (int *)HDmalloc(sizeof(int) * SPACE2_DIM1 * SPACE2_DIM2);
+
+    /* Create dataspace for datasets */
+    if ((sid2 = H5Screate_simple(SPACE2_RANK, dims2, NULL)) < 0)
+        goto out;
+
+    /* Create a dataset */
+    if ((did2 = H5Dcreate2(loc_id, "dsetreg", H5T_NATIVE_UCHAR, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    for (i = 0; i < SPACE2_DIM1 * SPACE2_DIM2; i++)
+        dwbuf[i] = i * 3;
+
+    /* Write selection to disk */
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dwbuf) < 0)
+        goto out;
+
+    /* Create dataspace for the reference dataset */
+    if ((sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL)) < 0)
+        goto out;
+
+    /* Create a dataset */
+    if ((did1 = H5Dcreate2(loc_id, "refreg", H5T_STD_REF_DSETREG, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* Select 6x6 hyperslab for first reference */
+    start[0] = 2; start[1] = 2;
+    stride[0] = 1; stride[1] = 1;
+    count[0] = 6; count[1] = 6;
+    block[0] = 1; block[1] = 1;
+    if (H5Sselect_hyperslab(sid2, H5S_SELECT_SET, start, stride, count, block) < 0)
+        goto out;
+
+
+    /* Store dataset region */
+    if (H5Rcreate(&wbuf[0], loc_id, "dsetreg", H5R_DATASET_REGION, sid2) < 0)
+        goto out;
+
+    /* Write selection to disk */
+    if (H5Dwrite(did1,H5T_STD_REF_DSETREG,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf) < 0)
+        goto out;
+
+    /* Close all objects */
+    if (H5Sclose(sid1) < 0)
+        goto out;
+    if (H5Dclose(did1) < 0)
+        goto out;
+    if (H5Sclose(sid2) < 0)
+        goto out;
+    if (H5Dclose(did2) < 0)
+        goto out;
+
+    retval = 0;
+
+out:
+    if(wbuf)
+        HDfree(wbuf);
+    if(dwbuf)
+        HDfree(dwbuf);
+
+    H5E_BEGIN_TRY
+    {
+        H5Sclose(sid1);
+        H5Sclose(sid2);
+        H5Dclose(did1);
+        H5Dclose(did2);
+    } H5E_END_TRY;
+
+    return retval;
+}
+
+/*-------------------------------------------------------------------------
+* Function: write_attr_in
+*
+* Purpose: write attributes in LOC_ID (dataset, group, named datatype)
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 12, 2003
+*
+*-------------------------------------------------------------------------
+*/
+
+static
+int write_attr_in(hid_t loc_id,
+                   const char* dset_name, /* for saving reference to dataset*/
+                   hid_t fid, /* for reference create */
+                   int make_diffs /* flag to modify data buffers */)
+{
+    /* Compound datatype */
+    typedef struct s_t
+    {
+        char   a;
+        double b;
+    } s_t;
+
+    typedef enum
+    {
+        RED,
+        GREEN
+    } e_t;
+
+    hid_t   aid = -1;
+    hid_t   sid = -1;
+    hid_t   tid = -1;
+    int     val, j, k, n;
+    unsigned i;
+    float   f;
+
+    /* create 1D attributes with dimension [2], 2 elements */
+    hsize_t    dims[1]={2};
+    char       buf1[2][3]= {"ab","de"};        /* string */
+    char       buf2[2]= {1,2};                 /* bitfield, opaque */
+    s_t        buf3[2]= {{1,2},{3,4}};         /* compound */
+    hobj_ref_t buf4[2];                        /* reference */
+    e_t        buf45[2]= {RED,RED};            /* enum */
+    hvl_t      buf5[2];                        /* vlen */
+    hsize_t    dimarray[1]={3};                /* array dimension */
+    int        buf6[2][3]= {{1,2,3},{4,5,6}};  /* array */
+    int        buf7[2]= {1,2};                 /* integer */
+    float      buf8[2]= {1,2};                 /* float */
+
+    /* create 2D attributes with dimension [3][2], 6 elements */
+    hsize_t    dims2[2]={3,2};
+    char       buf12[6][3]= {"ab","cd","ef","gh","ij","kl"};         /* string */
+    char       buf22[3][2]= {{1,2},{3,4},{5,6}};                     /* bitfield, opaque */
+    s_t        buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};   /* compound */
+    hobj_ref_t buf42[3][2];                                          /* reference */
+    e_t        buf452[3][2];                                         /* enum */
+    hvl_t      buf52[3][2];                                          /* vlen */
+    int        buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};  /* array */
+    int        buf72[3][2]= {{1,2},{3,4},{5,6}};                     /* integer */
+    float      buf82[3][2]= {{1,2},{3,4},{5,6}};                     /* float */
+
+    /* create 3D attributes with dimension [4][3][2], 24 elements */
+    hsize_t    dims3[3]={4,3,2};
+    char       buf13[24][3]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+        "rs","tu","vw","xz","AB","CD","EF","GH",
+        "IJ","KL","MN","PQ","RS","TU","VW","XZ"};  /* string */
+    char       buf23[4][3][2];    /* bitfield, opaque */
+    s_t        buf33[4][3][2];    /* compound */
+    hobj_ref_t buf43[4][3][2];    /* reference */
+    e_t        buf453[4][3][2];   /* enum */
+    hvl_t      buf53[4][3][2];    /* vlen */
+    int        buf63[24][3];      /* array */
+    int        buf73[4][3][2];    /* integer */
+    float      buf83[4][3][2];    /* float */
+
+
+    /*-------------------------------------------------------------------------
+    * 1D attributes
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        for (i=0; i<2; i++)
+            for (j=0; j<2; j++)
+            {
+                buf1[i][j]='z';
+            }
+    }
+    /*
+    buf1[2][2]= {"ab","de"};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <string> and <string>
+    position      string of </g1>  string of </g1> difference
+    ------------------------------------------------------------
+    [ 0 ]          a                z
+    [ 0 ]          b                z
+    [ 1 ]          d                z
+    [ 1 ]          e                z
+    */
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"string",tid,buf1) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        for (i=0; i<2; i++)
+            buf2[i]=buf2[1]=0;
+    }
+    /*
+    buf2[2]= {1,2};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <bitfield> and <bitfield>
+    position      bitfield of </g1> bitfield of </g1> difference
+    position        opaque of </g1> opaque of </g1> difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 1 ]          2               0               2
+    */
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"bitfield",tid,buf2) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+
+    /*
+    buf2[2]= {1,2};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <opaque> and <opaque>
+    position     opaque of </g1> opaque of </g1> difference
+    position        opaque of </g1> opaque of </g1> difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 1 ]          2               0               2
+    */
+
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"opaque",tid,buf2) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        for (i=0; i<2; i++)
+        {
+            buf3[i].a=0; buf3[i].b=0;
+        }
+    }
+
+    /*
+    buf3[2]= {{1,2},{3,4}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <compound> and <compound>
+    position        compound of </g1> compound of </g1> difference
+    ------------------------------------------------------------
+    [ 0 ]          1               5               4
+    [ 0 ]          2               5               3
+    [ 1 ]          3               5               2
+    [ 1 ]          4               5               1
+    */
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"compound",tid,buf3) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* object references ( H5R_OBJECT  */
+    if (dset_name)
+    {
+        if (H5Rcreate(&buf4[0],fid,dset_name,H5R_OBJECT,(hid_t)-1) < 0)
+            goto out;
+        if (H5Rcreate(&buf4[1],fid,dset_name,H5R_OBJECT,(hid_t)-1) < 0)
+            goto out;
+        if (make_attr(loc_id,1,dims,"reference",H5T_STD_REF_OBJ,buf4) < 0)
+            goto out;
+    }
+
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+    if (make_diffs)
+    {
+        for (i=0; i<2; i++)
+        {
+            buf45[i]=GREEN;
+        }
+    }
+    /*
+    buf45[2]= {RED,RED};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <enum> and <enum>
+    position     enum of </g1>   enum of </g1>   difference
+    ------------------------------------------------------------
+    [ 0 ]          RED              GREEN
+    [ 1 ]          RED              GREEN
+    */
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"enum",tid,buf45) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+
+    buf5[0].len = 1;
+    buf5[0].p = HDmalloc( 1 * sizeof(int));
+    ((int *)buf5[0].p)[0]=1;
+    buf5[1].len = 2;
+    buf5[1].p = HDmalloc(2 * sizeof(int));
+    ((int *)buf5[1].p)[0] = 2;
+    ((int *)buf5[1].p)[1] = 3;
+
+    if(make_diffs)
+    {
+        ((int *)buf5[0].p)[0] = 0;
+        ((int *)buf5[1].p)[0] = 0;
+        ((int *)buf5[1].p)[1] = 0;
+    }
+    /*
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    position        vlen of </g1>   vlen of </g1>   difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 1 ]          2               0               2
+    [ 1 ]          3               0               3
+    */
+
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((aid = H5Acreate2(loc_id, "vlen", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Awrite(aid, tid, buf5) < 0)
+        goto out;
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf5) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
+    aid = -1;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    sid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        for (i=0; i<2; i++)
+            for (j=0; j<3; j++)
+            {
+                buf6[i][j]=0;
+            }
+    }
+    /*
+    buf6[2][3]= {{1,2,3},{4,5,6}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <array> and <array>
+    position        array of </g1>  array of </g1>  difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 0 ]          2               0               2
+    [ 0 ]          3               0               3
+    [ 1 ]          4               0               4
+    [ 1 ]          5               0               5
+    [ 1 ]          6               0               6
+    */
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (make_attr(loc_id, 1, dims, "array", tid, buf6) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs)
+    {
+        for(i = 0; i < 2; i++)
+        {
+            buf7[i]=0;
+            buf8[i]=0;
+        }
+    }
+
+    /*
+    buf7[2]= {1,2};
+    buf8[2]= {1,2};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    position        integer of </g1> integer of </g1> difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 1 ]          2               0               2
+    position        float of </g1>  float of </g1>  difference
+    ------------------------------------------------------------
+    [ 0 ]          1               0               1
+    [ 1 ]          2               0               2
+    */
+    if (make_attr(loc_id,1,dims,"integer",H5T_NATIVE_INT,buf7) < 0)
+        goto out;
+    if (make_attr(loc_id,1,dims,"float",H5T_NATIVE_FLOAT,buf8) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * 2D attributes
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+    if (make_diffs)
+    {
+        HDmemset(buf12, 'z', sizeof buf12);
+    }
+
+    /*
+    buf12[6][2]= {"ab","cd","ef","gh","ij","kl"};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Attribute:   <string2D> and <string2D>
+    position        string2D of </g1> string2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          a                z
+    [ 0 0 ]          b                z
+    [ 0 1 ]          c                z
+    [ 0 1 ]          d                z
+    [ 1 0 ]          e                z
+    [ 1 0 ]          f                z
+    [ 1 1 ]          g                z
+    [ 1 1 ]          h                z
+    [ 2 0 ]          i                z
+    [ 2 0 ]          j                z
+    [ 2 1 ]          k                z
+    [ 2 1 ]          l                z
+    */
+
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"string2D",tid,buf12) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf22,0,sizeof buf22);
+    }
+
+    /*
+    buf22[3][2]= {{1,2},{3,4},{5,6}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Attribute:   <bitfield2D> and <bitfield2D>
+    position        bitfield2D of </g1> bitfield2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 1 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 2 0 ]          5               0               5
+    [ 2 1 ]          6               0               6
+    */
+
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"bitfield2D",tid,buf22) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+
+    /*
+    buf22[3][2]= {{1,2},{3,4},{5,6}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Attribute:   <opaque2D> and <opaque2D>
+    position        opaque2D of </g1> opaque2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 1 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 2 0 ]          5               0               5
+    [ 2 1 ]          6               0               6
+    */
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"opaque2D",tid,buf22) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+    if (make_diffs)
+    {
+        HDmemset(buf32,0,sizeof buf32);
+    }
+
+    /*
+    buf32[6]= {{1,2},{3,4},{5,6},{7,8},{9,10},{11,12}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Attribute:   <opaque2D> and <opaque2D>
+    position        opaque2D of </g1> opaque2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 1 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 2 0 ]          5               0               5
+    [ 2 1 ]          6               0               6
+    */
+
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"compound2D",tid,buf32) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* Create references to dataset */
+    if (dset_name)
+    {
+        for (i = 0; i < 3; i++)
+        {
+            for (j = 0; j < 2; j++)
+            {
+                if (H5Rcreate(&buf42[i][j],fid,dset_name,H5R_OBJECT,(hid_t)-1) < 0)
+                    goto out;
+            }
+        }
+        if (make_attr(loc_id,2,dims2,"reference2D",H5T_STD_REF_OBJ,buf42) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+    for (i=0; i<3; i++)
+    {
+        for (j=0; j<2; j++)
+        {
+            if (make_diffs) buf452[i][j]=GREEN; else buf452[i][j]=RED;
+        }
+    }
+
+    /*
+    Attribute:   <enum2D> and <enum2D>
+    position        enum2D of </g1> enum2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          RED              GREEN
+    [ 0 1 ]          RED              GREEN
+    [ 1 0 ]          RED              GREEN
+    [ 1 1 ]          RED              GREEN
+    [ 2 0 ]          RED              GREEN
+    [ 2 1 ]          RED              GREEN
+    */
+
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"enum2D",tid,buf452) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+    n=0;
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            unsigned l;
+
+            buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for(l = 0; l < i + 1; l++)
+                if(make_diffs)
+                    ((int *)buf52[i][j].p)[l] = 0;
+                else
+                    ((int *)buf52[i][j].p)[l] = n++;
+        }
+    }
+
+    /*
+    position        vlen2D of </g1> vlen2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 1 ]          1               0               1
+    [ 1 0 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 1 1 ]          5               0               5
+    [ 2 0 ]          6               0               6
+    [ 2 0 ]          7               0               7
+    [ 2 0 ]          8               0               8
+    [ 2 1 ]          9               0               9
+    [ 2 1 ]          10              0               10
+    [ 2 1 ]          11              0               11
+    */
+
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((aid = H5Acreate2(loc_id, "vlen2D", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Awrite(aid, tid, buf52) < 0)
+        goto out;
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf52) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
+    aid = -1;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    sid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf62,0,sizeof buf62);
+    }
+    /*
+    buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
+    $h5diff file7.h5 file6.h5 g1 g1 -v
+    Group:       </g1> and </g1>
+    Attribute:   <array2D> and <array2D>
+    position        array2D of </g1> array2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 0 ]          2               0               2
+    [ 0 0 ]          3               0               3
+    [ 0 1 ]          4               0               4
+    [ 0 1 ]          5               0               5
+    [ 0 1 ]          6               0               6
+    [ 1 0 ]          7               0               7
+    [ 1 0 ]          8               0               8
+    [ 1 0 ]          9               0               9
+    [ 1 1 ]          10              0               10
+    [ 1 1 ]          11              0               11
+    [ 1 1 ]          12              0               12
+    [ 2 0 ]          13              0               13
+    [ 2 0 ]          14              0               14
+    [ 2 0 ]          15              0               15
+    [ 2 1 ]          16              0               16
+    [ 2 1 ]          17              0               17
+    [ 2 1 ]          18              0               18
+    */
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (make_attr(loc_id, 2, dims2, "array2D", tid, buf62) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+
+    if(make_diffs)
+    {
+        HDmemset(buf72, 0, sizeof buf72);
+        HDmemset(buf82, 0, sizeof buf82);
+    }
+    /*
+    Attribute:   <integer2D> and <integer2D>
+    position        integer2D of </g1> integer2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 1 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 2 0 ]          5               0               5
+    [ 2 1 ]          6               0               6
+    6 differences found
+    Attribute:   <float2D> and <float2D>
+    position        float2D of </g1> float2D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 ]          1               0               1
+    [ 0 1 ]          2               0               2
+    [ 1 0 ]          3               0               3
+    [ 1 1 ]          4               0               4
+    [ 2 0 ]          5               0               5
+    [ 2 1 ]          6               0               6
+    */
+
+    if (make_attr(loc_id,2,dims2,"integer2D",H5T_NATIVE_INT,buf72) < 0)
+        goto out;
+    if (make_attr(loc_id,2,dims2,"float2D",H5T_NATIVE_FLOAT,buf82) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * 3D attributes
+    *-------------------------------------------------------------------------
+    */
+
+    /*-------------------------------------------------------------------------
+    * H5T_STRING
+    *-------------------------------------------------------------------------
+    */
+
+    if (make_diffs)
+    {
+        HDmemset(buf13,'z',sizeof buf13);
+    }
+
+    /*
+    buf13[24][2]= {"ab","cd","ef","gh","ij","kl","mn","pq",
+    "rs","tu","vw","xz","AB","CD","EF","GH",
+    "IJ","KL","MN","PQ","RS","TU","VW","XZ"};
+
+    Attribute:   <string3D> and <string3D>
+    position        string3D of </g1> string3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          a                z
+    [ 0 0 0 ]          b                z
+    [ 0 0 1 ]          c                z
+    [ 0 0 1 ]          d                z
+    [ 0 1 0 ]          e                z
+    [ 0 1 0 ]          f                z
+    [ 0 1 1 ]          g                z
+    [ 0 1 1 ]          h                z
+    [ 0 2 0 ]          i                z
+    [ 0 2 0 ]          j                z
+    [ 0 2 1 ]          k                z
+    [ 0 2 1 ]          l                z
+    [ 1 0 0 ]          m                z
+    [ 1 0 0 ]          n                z
+    [ 1 0 1 ]          p                z
+    [ 1 0 1 ]          q                z
+    [ 1 1 0 ]          r                z
+    [ 1 1 0 ]          s                z
+    [ 1 1 1 ]          t                z
+    [ 1 1 1 ]          u                z
+    [ 1 2 0 ]          v                z
+    [ 1 2 0 ]          w                z
+    [ 1 2 1 ]          x                z
+    [ 2 0 0 ]          A                z
+    [ 2 0 0 ]          B                z
+    [ 2 0 1 ]          C                z
+    [ 2 0 1 ]          D                z
+    [ 2 1 0 ]          E                z
+    [ 2 1 0 ]          F                z
+    [ 2 1 1 ]          G                z
+    [ 2 1 1 ]          H                z
+    [ 2 2 0 ]          I                z
+    [ 2 2 0 ]          J                z
+    [ 2 2 1 ]          K                z
+    [ 2 2 1 ]          L                z
+    [ 3 0 0 ]          M                z
+    [ 3 0 0 ]          N                z
+    [ 3 0 1 ]          P                z
+    [ 3 0 1 ]          Q                z
+    [ 3 1 0 ]          R                z
+    [ 3 1 0 ]          S                z
+    [ 3 1 1 ]          T                z
+    [ 3 1 1 ]          U                z
+    [ 3 2 0 ]          V                z
+    [ 3 2 0 ]          W                z
+    [ 3 2 1 ]          X                z
+    [ 3 2 1 ]          Z                z
+    */
+
+    if ((tid = H5Tcopy(H5T_C_S1)) < 0)
+        goto out;
+    if (H5Tset_size(tid, (size_t)2) < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"string3D",tid,buf13) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_BITFIELD
+    *-------------------------------------------------------------------------
+    */
+
+    n=1;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char)(n++);
+            }
+        }
+    }
+
+    /*
+    position        bitfield3D of </g1> bitfield3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          1               0               1
+    [ 0 0 1 ]          2               0               2
+    [ 0 1 0 ]          3               0               3
+    [ 0 1 1 ]          4               0               4
+    [ 0 2 0 ]          5               0               5
+    [ 0 2 1 ]          6               0               6
+    [ 1 0 0 ]          7               0               7
+    [ 1 0 1 ]          8               0               8
+    [ 1 1 0 ]          9               0               9
+    [ 1 1 1 ]          10              0               10
+    [ 1 2 0 ]          11              0               11
+    [ 1 2 1 ]          12              0               12
+    [ 2 0 0 ]          13              0               13
+    [ 2 0 1 ]          14              0               14
+    [ 2 1 0 ]          15              0               15
+    [ 2 1 1 ]          16              0               16
+    [ 2 2 0 ]          17              0               17
+    [ 2 2 1 ]          18              0               18
+    [ 3 0 0 ]          19              0               19
+    [ 3 0 1 ]          20              0               20
+    [ 3 1 0 ]          21              0               21
+    [ 3 1 1 ]          22              0               22
+    [ 3 2 0 ]          23              0               23
+    [ 3 2 1 ]          24              0               24
+    */
+
+    if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"bitfield3D",tid,buf23) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_OPAQUE
+    *-------------------------------------------------------------------------
+    */
+    if ((tid = H5Tcreate(H5T_OPAQUE, (size_t)1)) < 0)
+        goto out;
+    if (H5Tset_tag(tid, "1-byte opaque type") < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"opaque3D",tid,buf23) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_COMPOUND
+    *-------------------------------------------------------------------------
+    */
+
+    n=1;
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                if(make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0;
+                }
+                else {
+                    buf33[i][j][k].a = (char)(n++);
+                    buf33[i][j][k].b = n++;
+                }
+            }
+        }
+    }
+    /*position        compound3D of </g1> compound3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          1               0               1
+    [ 0 0 0 ]          2               0               2
+    [ 0 0 1 ]          3               0               3
+    [ 0 0 1 ]          4               0               4
+    [ 0 1 0 ]          5               0               5
+    [ 0 1 0 ]          6               0               6
+    [ 0 1 1 ]          7               0               7
+    [ 0 1 1 ]          8               0               8
+    [ 0 2 0 ]          9               0               9
+    [ 0 2 0 ]          10              0               10
+    [ 0 2 1 ]          11              0               11
+    [ 0 2 1 ]          12              0               12
+    [ 1 0 0 ]          13              0               13
+    [ 1 0 0 ]          14              0               14
+    [ 1 0 1 ]          15              0               15
+    [ 1 0 1 ]          16              0               16
+    [ 1 1 0 ]          17              0               17
+    [ 1 1 0 ]          18              0               18
+    [ 1 1 1 ]          19              0               19
+    [ 1 1 1 ]          20              0               20
+    [ 1 2 0 ]          21              0               21
+    [ 1 2 0 ]          22              0               22
+    [ 1 2 1 ]          23              0               23
+    [ 1 2 1 ]          24              0               24
+    [ 2 0 0 ]          25              0               25
+    [ 2 0 0 ]          26              0               26
+    [ 2 0 1 ]          27              0               27
+    [ 2 0 1 ]          28              0               28
+    [ 2 1 0 ]          29              0               29
+    [ 2 1 0 ]          30              0               30
+    [ 2 1 1 ]          31              0               31
+    [ 2 1 1 ]          32              0               32
+    [ 2 2 0 ]          33              0               33
+    [ 2 2 0 ]          34              0               34
+    [ 2 2 1 ]          35              0               35
+    [ 2 2 1 ]          36              0               36
+    [ 3 0 0 ]          37              0               37
+    [ 3 0 0 ]          38              0               38
+    [ 3 0 1 ]          39              0               39
+    [ 3 0 1 ]          40              0               40
+    [ 3 1 0 ]          41              0               41
+    [ 3 1 0 ]          42              0               42
+    [ 3 1 1 ]          43              0               43
+    [ 3 1 1 ]          44              0               44
+    [ 3 2 0 ]          45              0               45
+    [ 3 2 0 ]          46              0               46
+    [ 3 2 1 ]          47              0               47
+    [ 3 2 1 ]          48              0               48
+    */
+
+
+
+    if ((tid = H5Tcreate (H5T_COMPOUND, sizeof(s_t))) < 0)
+        goto out;
+    if (H5Tinsert(tid, "a", HOFFSET(s_t, a), H5T_NATIVE_CHAR) < 0)
+        goto out;
+    if (H5Tinsert(tid, "b", HOFFSET(s_t, b), H5T_NATIVE_DOUBLE) < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"compound3D",tid,buf33) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_REFERENCE
+    *-------------------------------------------------------------------------
+    */
+    /* Create references to dataset */
+    if (dset_name)
+    {
+        for (i = 0; i < 4; i++)
+        {
+            for (j = 0; j < 3; j++)
+            {
+                for (k = 0; k < 2; k++)
+                    if (H5Rcreate(&buf43[i][j][k],fid,dset_name,H5R_OBJECT,(hid_t)-1) < 0)
+                        goto out;
+            }
+        }
+        if (make_attr(loc_id,3,dims3,"reference3D",H5T_STD_REF_OBJ,buf43) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * H5T_ENUM
+    *-------------------------------------------------------------------------
+    */
+
+    for (i = 0; i < 4; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            for (k = 0; k < 2; k++)
+            {
+                if (make_diffs)
+                {
+                    buf453[i][j][k]=RED;
+                }
+                else
+                {
+                    buf453[i][j][k]=GREEN;
+                }
+            }
+        }
+    }
+
+    /*
+    position        enum3D of </g1> enum3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          GREEN            RED
+    [ 0 0 1 ]          GREEN            RED
+    [ 0 1 0 ]          GREEN            RED
+    [ 0 1 1 ]          GREEN            RED
+    [ 0 2 0 ]          GREEN            RED
+    [ 0 2 1 ]          GREEN            RED
+    [ 1 0 0 ]          GREEN            RED
+    [ 1 0 1 ]          GREEN            RED
+    [ 1 1 0 ]          GREEN            RED
+    [ 1 1 1 ]          GREEN            RED
+    [ 1 2 0 ]          GREEN            RED
+    [ 1 2 1 ]          GREEN            RED
+    [ 2 0 0 ]          GREEN            RED
+    [ 2 0 1 ]          GREEN            RED
+    [ 2 1 0 ]          GREEN            RED
+    [ 2 1 1 ]          GREEN            RED
+    [ 2 2 0 ]          GREEN            RED
+    [ 2 2 1 ]          GREEN            RED
+    [ 3 0 0 ]          GREEN            RED
+    [ 3 0 1 ]          GREEN            RED
+    [ 3 1 0 ]          GREEN            RED
+    [ 3 1 1 ]          GREEN            RED
+    [ 3 2 0 ]          GREEN            RED
+    [ 3 2 1 ]          GREEN            RED
+    */
+
+
+    if ((tid = H5Tcreate(H5T_ENUM, sizeof(e_t))) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "RED",   (val = 0, &val)) < 0)
+        goto out;
+    if (H5Tenum_insert(tid, "GREEN", (val = 1, &val)) < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"enum3D",tid,buf453) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_VLEN
+    *-------------------------------------------------------------------------
+    */
+
+    /* Allocate and initialize VL dataset to write */
+    n=0;
+    for (i = 0; i < 4; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            for (k = 0; k < 2; k++)
+            {
+                unsigned l;
+
+                buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)i + 1;
+                for (l = 0; l < i + 1; l++)
+                    if (make_diffs)
+                        ((int *)buf53[i][j][k].p)[l] = 0;
+                    else
+                        ((int *)buf53[i][j][k].p)[l] = n++;
+            }
+        }
+    }
+    /*
+    position        vlen3D of </g1> vlen3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 1 ]          1               0               1
+    [ 0 1 0 ]          2               0               2
+    [ 0 1 1 ]          3               0               3
+    [ 0 2 0 ]          4               0               4
+    [ 0 2 1 ]          5               0               5
+    [ 1 0 0 ]          6               0               6
+    [ 1 0 0 ]          7               0               7
+    [ 1 0 1 ]          8               0               8
+    [ 1 0 1 ]          9               0               9
+    [ 1 1 0 ]          10              0               10
+    etc
+    */
+    if ((sid = H5Screate_simple(3, dims3, NULL)) < 0)
+        goto out;
+    if ((tid = H5Tvlen_create(H5T_NATIVE_INT)) < 0)
+        goto out;
+    if ((aid = H5Acreate2(loc_id, "vlen3D", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (H5Awrite(aid, tid, buf53) < 0)
+        goto out;
+    if (H5Dvlen_reclaim(tid, sid, H5P_DEFAULT, buf53) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
+    aid = -1;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    sid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_ARRAY
+    *-------------------------------------------------------------------------
+    */
+    n=1;
+    for (i = 0; i < 24; i++)
+    {
+        for (j = 0; j < (int)dimarray[0]; j++)
+        {
+            if (make_diffs) buf63[i][j]=0;
+            else buf63[i][j]=n++;
+        }
+    }
+    /*
+    position        array3D of </g1> array3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          1               0               1
+    [ 0 0 0 ]          2               0               2
+    [ 0 0 0 ]          3               0               3
+    [ 0 0 1 ]          4               0               4
+    [ 0 0 1 ]          5               0               5
+    [ 0 0 1 ]          6               0               6
+    [ 0 1 0 ]          7               0               7
+    etc
+    */
+
+    if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
+        goto out;
+    if (make_attr(loc_id, 3, dims3, "array3D", tid, buf63) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    tid = -1;
+
+    /*-------------------------------------------------------------------------
+    * H5T_INTEGER and H5T_FLOAT
+    *-------------------------------------------------------------------------
+    */
+    n = 1; f = 1;
+    for(i = 0; i < 4; i++)
+    {
+        for(j = 0; j < 3; j++)
+        {
+            for(k = 0; k < 2; k++)
+            {
+                if(make_diffs)
+                {
+                    buf73[i][j][k] = 0;
+                    buf83[i][j][k] = 0;
+                }
+                else
+                {
+                    buf73[i][j][k] = n++;
+                    buf83[i][j][k] = f++;
+                }
+            }
+        }
+    }
+
+    /*
+    position        integer3D of </g1> integer3D of </g1> difference
+    ------------------------------------------------------------
+    [ 0 0 0 ]          1               0               1
+    [ 0 0 1 ]          2               0               2
+    [ 0 1 0 ]          3               0               3
+    [ 0 1 1 ]          4               0               4
+    [ 0 2 0 ]          5               0               5
+    [ 0 2 1 ]          6               0               6
+    [ 1 0 0 ]          7               0               7
+    [ 1 0 1 ]          8               0               8
+    [ 1 1 0 ]          9               0               9
+    [ 1 1 1 ]          10              0               10
+    etc
+    */
+    if (make_attr(loc_id,3,dims3,"integer3D",H5T_NATIVE_INT,buf73) < 0)
+        goto out;
+    if (make_attr(loc_id,3,dims3,"float3D",H5T_NATIVE_FLOAT,buf83) < 0)
+        goto out;
+
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Aclose(aid);
+        H5Sclose(sid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_dset
+*
+* Purpose: utility function to create and write a dataset in LOC_ID
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 12, 2003
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_dset(hid_t loc_id,
+              const char *name,
+              hid_t sid,
+              hid_t dcpl,
+              void *buf)
+{
+    hid_t   did=-1;
+
+    if ((did = H5Dcreate2(loc_id, name, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+        return -1;
+    if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+        goto out;
+    if (H5Dclose(did) < 0)
+        return -1;
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: write_dset
+*
+* Purpose: utility function to create and write a dataset in LOC_ID
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 12, 2003
+*
+*-------------------------------------------------------------------------
+*/
+static
+int write_dset( hid_t loc_id,
+               int rank,
+               hsize_t *dims,
+               const char *dset_name,
+               hid_t tid,
+               void *buf )
+{
+    hid_t   did=-1;
+    hid_t   sid=-1;
+
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+        return -1;
+    if ((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if (buf)
+    {
+        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+            goto out;
+    }
+    if (H5Dclose(did) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+
+/*-------------------------------------------------------------------------
+* Function: make_attr
+*
+* Purpose: utility function to write an attribute in LOC_ID
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 12, 2003
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_attr(hid_t loc_id,
+              int rank,
+              hsize_t *dims,
+              const char *attr_name,
+              hid_t tid,
+              void *buf)
+{
+    hid_t   aid;
+    hid_t   sid;
+
+    if ((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+        return -1;
+    if ((aid = H5Acreate2(loc_id, attr_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(buf)
+    {
+        if(H5Awrite(aid, tid, buf) < 0)
+            goto out;
+    }
+    if (H5Aclose(aid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Aclose(aid);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+* Function: make_named_dtype
+*
+* Purpose: create a file with named datatypes in various configurations
+*
+*-------------------------------------------------------------------------
+*/
+static
+int make_named_dtype(hid_t loc_id)
+{
+    hsize_t dims[1] ={3};
+    hid_t   did=-1;
+    hid_t   aid=-1;
+    hid_t   sid=-1;
+    hid_t   tid=-1;
+    hid_t   gid=-1;
+
+    if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
+        goto out;
+
+    /* Create a dataset with an anonymous committed datatype as the first thing
+     * h5repack sees */
+    if((tid = H5Tcopy(H5T_STD_I16LE)) < 0)
+        goto out;
+    if(H5Tcommit_anon(loc_id, tid, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    if ((did = H5Dcreate2(loc_id, "A", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+
+    /* Create an attribute on that dataset that uses a committed datatype in
+     * a remote group */
+    if((gid = H5Gcreate2(loc_id, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
+    if((gid = H5Gcreate2(loc_id, "M/M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
+    if((tid = H5Tcopy(H5T_STD_I16BE)) < 0)
+        goto out;
+    if(H5Tcommit2(loc_id, "/M/M/A", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    if((aid = H5Acreate2(did, "A", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Aclose(aid) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /* Create a dataset in the remote group that uses a committed datatype in
+     * the root group */
+    if((tid = H5Tcopy(H5T_STD_I32LE)) < 0)
+        goto out;
+    if(H5Tcommit2(loc_id, "N", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    if((did = H5Dcreate2(loc_id, "M/M/B", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+
+    /* Create an attribute on the remote dataset that uses an anonymous
+     * committed datatype */
+    if((tid = H5Tcopy(H5T_STD_I32BE)) < 0)
+        goto out;
+    if(H5Tcommit_anon(loc_id, tid, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        goto out;
+    if((aid = H5Acreate2(did, "A", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Aclose(aid) < 0)
+        goto out;
+
+    /* Create another attribute that uses the same anonymous datatype */
+    if((aid = H5Acreate2(did, "B", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Aclose(aid) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /* Create a dataset in the root group that uses the committed datatype in
+     * the root group */
+    if((tid = H5Topen2(loc_id, "N", H5P_DEFAULT)) < 0)
+        goto out;
+    if((did = H5Dcreate2(loc_id, "O", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /* Create 2 attributes on the committed datatype that use that datatype */
+    if((aid =  H5Acreate2(tid, "A", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Aclose(aid) < 0)
+        goto out;
+    if((aid =  H5Acreate2(tid, "B", tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5Aclose(aid) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+
+    /* Close */
+    if (H5Sclose(sid) < 0)
+        goto out;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY
+    {
+        H5Tclose(tid);
+        H5Aclose(aid);
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Gclose(gid);
+    } H5E_END_TRY;
+    return -1;
+} /* end make_named_dtype() */
+
+/*-------------------------------------------------------------------------
+ * Function: add_attr_with_objref
+ *
+ * Purpose: 
+ *  Create attributes with object reference to objects (dset,
+ *  group, datatype). 
+ *
+ * Note:
+ *  this function depends on locally created objects, however can be modified
+ *  to be independent as necessary
+ *
+ * Programmer: Jonathan Kim (March 23, 2010)
+ *------------------------------------------------------------------------*/
+static herr_t add_attr_with_objref(hid_t file_id, hid_t obj_id)
+{
+    int ret = SUCCEED;
+    int status;
+    /* attr obj ref */
+    hsize_t dim_attr_objref[1]={3};
+    hobj_ref_t data_attr_objref[3];
+
+    /* --------------------------------
+     * add attribute with obj ref type
+     */    
+    /* ref to dset */
+    status = H5Rcreate(&data_attr_objref[0],file_id,NAME_OBJ_DS1,H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* ref to group */
+    status = H5Rcreate(&data_attr_objref[1],file_id,NAME_OBJ_GRP,H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* ref to datatype */
+    status = H5Rcreate(&data_attr_objref[2],file_id,NAME_OBJ_NDTYPE,H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create attr with obj ref type */
+    status = make_attr(obj_id,1,dim_attr_objref,"Attr_OBJREF",H5T_STD_REF_OBJ,data_attr_objref);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+
+    return ret;
+
+}
+
+/*-------------------------------------------------------------------------
+ * Function: add_attr_with_regref
+ *
+ * Purpose: 
+ *  Create attributes with region reference to dset
+ *
+ * Note:
+ *  this function depends on locally created objects, however can be modified
+ *  to be independent as necessary
+ *
+ * Programmer: Jonathan Kim (March 23, 2010)
+ *------------------------------------------------------------------------*/
+static herr_t add_attr_with_regref(hid_t file_id, hid_t obj_id)
+{
+    int ret = SUCCEED;
+    int status;
+
+    /* attr region ref */
+    hid_t sid_regrefed_dset=0;
+    hsize_t dim_regrefed_dset[2]={3,6};
+    hsize_t coords_regrefed_dset[3][2] = {{0,1},{1,2},{2,3}};
+    hsize_t dim_attr_regref[1]= {1}; /* dim of  */
+    hdset_reg_ref_t data_attr_regref[1];
+
+
+    /* -----------------------------------
+     * add attribute with region ref type
+     */
+    sid_regrefed_dset = H5Screate_simple (2, dim_regrefed_dset, NULL);
+    if (sid_regrefed_dset < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* select elements space for reference */
+    status = H5Sselect_elements (sid_regrefed_dset, H5S_SELECT_SET, (size_t)3, coords_regrefed_dset[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create region reference from elements space */
+    status = H5Rcreate (&data_attr_regref[0], file_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_regrefed_dset);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create attr with region ref type */
+    status = make_attr(obj_id,1,dim_attr_regref,"Attr_REGREF",H5T_STD_REF_DSETREG,data_attr_regref);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> make_attr failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+    if (sid_regrefed_dset > 0)
+        H5Sclose (sid_regrefed_dset);
+
+    return ret;
+
+}
+
+/*-------------------------------------------------------------------------
+ * Function: gen_refered_objs
+ *
+ * Purpose: 
+ *  Create objects (dataset, group, datatype) to be referenced
+ *
+ * Note:
+ *  This function is to use along with gen_obj_ref() gen_region_ref() 
+ *
+ * Programmer: Jonathan Kim (March 23, 2010)
+ *------------------------------------------------------------------------*/
+static herr_t gen_refered_objs(hid_t loc_id)
+{
+    int status;
+    herr_t ret = SUCCEED;
+
+    /* objects (dset, group, datatype) */
+    hid_t sid=0, did1=0, gid=0, tid=0;
+    hsize_t dims1[1]={3};
+    int data[3] = {10,20,30};
+
+    /* Dset2 */
+    hid_t sid2=0, did2=0; 
+    hsize_t dims2[2] = {3,16};
+    char  data2[3][16] = {"The quick brown", "fox jumps over ", "the 5 lazy dogs"};
+
+    /*-----------------------
+     * add short dataset 
+     * (define NAME_OBJ_DS1)
+     */
+    sid = H5Screate_simple(1, dims1, NULL);
+    if (sid < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    did1 = H5Dcreate2 (loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (did1 < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*--------------
+     * add group  
+     * (define NAME_OBJ_GRP)
+     */
+    gid = H5Gcreate2 (loc_id, NAME_OBJ_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (gid < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*----------------------
+     * add named datatype
+     * (define NAME_OBJ_NDTYPE)
+     */
+     tid = H5Tcopy(H5T_NATIVE_INT);
+     status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+     if (status < 0)
+     {
+        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+     }
+
+
+   /*--------------------------
+    * create long dataset
+    * (define NAME_OBJ_DS2)
+    */
+    sid2 = H5Screate_simple (2, dims2, NULL);
+    if (sid2 < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create normal dataset which is refered */
+    did2 = H5Dcreate2 (loc_id, NAME_OBJ_DS2, H5T_STD_I8LE, sid2, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
+    if (did2 < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* write values to dataset */
+    status = H5Dwrite (did2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+    if(did1 > 0)
+        H5Dclose(did1);
+    if(gid > 0)
+        H5Gclose(gid);
+    if(tid > 0)
+        H5Tclose(tid);
+    if(sid > 0)
+        H5Sclose(sid);
+
+    if(did2 > 0)
+        H5Dclose(did2);
+    if(sid2 > 0)
+        H5Sclose(sid2);
+    return ret;
+    
+}
+
+/*-------------------------------------------------------------------------
+ * Function: gen_obj_ref
+ *
+ * Purpose: 
+ *  Generate object references to objects (dataset,group and named datatype)
+ *
+ * Note:
+ *  copied from h5copygentest.c and upate to create named datatype  
+ *
+ * Programmer: Jonathan Kim (March 18, 2010)
+ *------------------------------------------------------------------------*/
+static herr_t gen_obj_ref(hid_t loc_id)
+{
+    int status;
+    herr_t ret = SUCCEED;
+
+    hid_t sid=0, oid=0;
+    hsize_t dims_dset_objref[1]={3};
+
+    /* attr with int type */
+    hsize_t dim_attr_int[1]={2};
+    int data_attr_int[2] = {10,20}; 
+
+    /* write buffer for obj reference */
+    hobj_ref_t objref_buf[3];
+
+    /*---------------------------------------------------------
+     * create obj references to the previously created objects.
+     * Passing -1 as reference is an object.*/
+
+    /* obj ref to dataset */
+    status = H5Rcreate (&objref_buf[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* obj ref to group */
+    status = H5Rcreate (&objref_buf[1], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* obj ref to named-datatype */
+    status = H5Rcreate (&objref_buf[2], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*---------------------------------------------------------
+     * create dataset contain references 
+     */
+    sid = H5Screate_simple (1, dims_dset_objref, NULL);
+    if (sid < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    oid = H5Dcreate2 (loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
+    if (oid < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, objref_buf);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* add attribute with int type */
+    if (make_attr(oid,1,dim_attr_int,"integer",H5T_NATIVE_INT,data_attr_int) < 0)
+        goto out;
+
+    /* add attribute with obj ref */
+    status = add_attr_with_objref(loc_id, oid);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* add attribute with region ref */
+    status = add_attr_with_regref(loc_id, oid);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+    if(oid > 0)
+        H5Dclose(oid);
+    if(sid > 0)
+        H5Sclose(sid);
+
+    return ret;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: gen_region_ref
+ *
+ * Purpose: Generate dataset region references
+ *
+ * Note:
+ *  copied from h5copygentest.c 
+ *
+ * Programmer: Jonathan Kim (March 18, 2010)
+ *------------------------------------------------------------------------*/
+static herr_t gen_region_ref(hid_t loc_id)
+{
+    int status;
+    herr_t ret = SUCCEED;
+
+    /* target dataset */
+    hid_t sid_trg=0; 
+    hsize_t dims_trg[2] = {3,16};
+
+    /* dset with region ref type */
+    hid_t sid_ref=0, oid_ref=0; 
+
+    /* region ref to target dataset */
+    hsize_t coords[4][2] = { {0,1}, {2,11}, {1,0}, {2,4} };
+    hdset_reg_ref_t  rr_data[2];
+    hsize_t start[2] = {0,0};
+    hsize_t stride[2] = {2,11};
+    hsize_t count[2] = {2,2};
+    hsize_t block[2] = {1,3};
+    hsize_t dims1[1] = {2};
+
+    /* attr with int type */
+    hsize_t dim_attr_int[1]={2};
+    int data_attr_int[2] = {10,20}; 
+
+    sid_trg = H5Screate_simple (2, dims_trg, NULL);
+    if (sid_trg < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* select elements space for reference */
+    status = H5Sselect_elements (sid_trg, H5S_SELECT_SET, (size_t)4, coords[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create region reference from elements space */
+    status = H5Rcreate (&rr_data[0], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* select hyperslab space for reference */
+    status = H5Sselect_hyperslab (sid_trg, H5S_SELECT_SET, start, stride, count, block);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create region reference from hyperslab space */
+    status = H5Rcreate (&rr_data[1], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* Create dataspace. */
+    sid_ref = H5Screate_simple (1, dims1, NULL);
+    if (sid_ref < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* create region reference dataset */
+    oid_ref = H5Dcreate2 (loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid_ref, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT);
+    if (oid_ref < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* write data as region references */
+    status = H5Dwrite (oid_ref, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* add attribute with int type */
+    if (make_attr(oid_ref,1,dim_attr_int,"integer",H5T_NATIVE_INT,data_attr_int) < 0)
+        goto out;
+
+    /* add attribute with obj ref */
+    status = add_attr_with_objref(loc_id, oid_ref);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* add attribute with region ref */
+    status = add_attr_with_regref(loc_id, oid_ref);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+    if (oid_ref > 0)
+        H5Dclose (oid_ref);
+    if (sid_ref > 0)
+        H5Sclose (sid_ref);
+    if (sid_trg > 0)
+        H5Sclose (sid_trg); 
+
+    return ret;
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_references
+*
+* Purpose: create a file with obj and region references 
+*
+* Programmer: Jonathan Kim (March 18, 2010)
+*-------------------------------------------------------------------------
+*/
+static herr_t make_references(hid_t loc_id)
+{
+    herr_t ret = SUCCEED;
+    herr_t status;
+
+    /* add target objects */
+    status = gen_refered_objs(loc_id);
+    if (status == FAIL)
+    {
+        fprintf(stderr, "Failed to generate referenced object.\n");
+        ret = FAIL;
+    } 
+
+    /* add object reference */
+    status = gen_obj_ref(loc_id);
+    if (status == FAIL)
+    {
+        fprintf(stderr, "Failed to generate object reference.\n");
+        ret = FAIL;
+    }
+
+    /* add region reference */
+    status = gen_region_ref(loc_id);
+    if (status == FAIL)
+    {
+        fprintf(stderr, "Failed to generate region reference.\n");
+        ret = FAIL;
+    }
+
+    return ret;
+}
+
+/*-------------------------------------------------------------------------
+* Function: make_complex_attr_references
+*
+* Purpose: 
+*   create a file with :
+*   1. obj ref in attribute of compound type
+*   2. region ref in attribute of compound type
+*   3. obj ref in attribute of vlen type
+*   4. region ref in attribute of vlen type
+*
+* Programmer: Jonathan (March 25, 2010)
+*-------------------------------------------------------------------------
+*/
+/* obj dset */
+#define RANK_OBJ 2
+#define DIM0_OBJ 6
+#define DIM1_OBJ 10
+/* container dset */
+#define RANK_DSET 1
+#define DIM_DSET 4
+/* 1. obj references in compound attr */
+#define RANK_COMP_OBJREF 1
+#define DIM_COMP_OBJREF 3   /* for dataset, group, datatype */
+/* 2. region references in compound attr */
+#define RANK_COMP_REGREF 1
+#define DIM_COMP_REGREF 1   /* for element region */
+/* 3. obj references in vlen attr */
+#define RANK_VLEN_OBJREF 1
+#define DIM_VLEN_OBJREF 3   /* for dataset, group, datatype */
+#define LEN0_VLEN_OBJREF 1  /* dataset */
+#define LEN1_VLEN_OBJREF 1  /* group */
+#define LEN2_VLEN_OBJREF 1  /* datatype */
+/* 4. region references in vlen attr */
+#define RANK_VLEN_REGREF 1
+#define DIM_VLEN_REGREF 1   /*  for element region */
+#define LEN0_VLEN_REGREF 1  /* element region  */ 
+
+static herr_t make_complex_attr_references(hid_t loc_id)
+{
+    herr_t ret = SUCCEED;
+    herr_t status; 
+    /* 
+     * for objects 
+     */
+    hid_t objgid=0, objdid=0, objtid=0, objsid=0;
+    hsize_t obj_dims[RANK_OBJ] = {DIM0_OBJ, DIM1_OBJ};
+    int obj_data[DIM0_OBJ][DIM1_OBJ]=
+        {{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+         {10,11,12,13,14,15,16,17,18,19},
+         {20,21,22,23,24,25,26,27,28,29},
+         {30,31,32,33,34,35,36,37,38,39},
+         {40,41,42,43,44,45,46,47,48,49},
+         {50,51,52,53,54,55,56,57,58,59}};
+
+    /*
+     * group main
+     */
+    hid_t main_gid=0;
+    /*
+     * dataset which the attribute will be attached to
+     */
+    hsize_t main_dset_dims[RANK_DSET] = {DIM_DSET};
+    hid_t main_sid=0, main_did=0;
+    /* 
+     * 1. obj references in compound attr 
+     */
+    hid_t comp_objref_tid=0, comp_objref_aid=0;
+    typedef struct comp_objref_t {
+        hobj_ref_t val_objref;
+        int val_int;
+    } comp_objref_t;
+    comp_objref_t comp_objref_data[DIM_COMP_OBJREF];
+    hid_t comp_objref_attr_sid=0;
+    hsize_t comp_objref_dim[RANK_COMP_OBJREF] = {DIM_COMP_OBJREF};
+
+    /* 
+     * 2. region references in compound attr 
+     */
+    hid_t comp_regref_tid=0, comp_regref_aid=0;
+    typedef struct comp_regref_t {
+        hdset_reg_ref_t val_regref;
+        int val_int;
+    } comp_regref_t;
+    comp_regref_t comp_regref_data[DIM_COMP_REGREF];
+    hid_t comp_regref_attr_sid=0;
+    hsize_t comp_regref_dim[RANK_COMP_REGREF] = {DIM_COMP_REGREF};
+    hsize_t coords[4][2] = { {0,1}, {2,3}, {3,4}, {4,5} };
+    
+    /* 
+     * 3. obj references in vlen attr 
+     */
+    hid_t vlen_objref_attr_tid=0, vlen_objref_attr_sid=0;
+    hid_t vlen_objref_attr_id=0;
+    hvl_t vlen_objref_data[DIM_VLEN_OBJREF];
+    hsize_t vlen_objref_dims[RANK_VLEN_OBJREF] = {DIM_VLEN_OBJREF};
+
+    /* 
+     * 4. region references in vlen attr
+     */
+    hid_t vlen_regref_attr_tid=0, vlen_regref_attr_sid=0;
+    hid_t vlen_regref_attr_id=0;
+    hvl_t vlen_regref_data[DIM_VLEN_REGREF];
+    hsize_t vlen_regref_dim[RANK_VLEN_REGREF] = {DIM_VLEN_REGREF};
+
+
+    /* ---------------------------------------
+     * create objects which to be referenced 
+     */
+    /* object1 group */
+    objgid = H5Gcreate2(loc_id, NAME_OBJ_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+
+    /* object2 dataset */
+    objsid = H5Screate_simple(RANK_OBJ, obj_dims, NULL);
+    objdid = H5Dcreate2(loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, objsid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Dwrite(objdid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* object3 named datatype */
+    objtid = H5Tcopy(H5T_NATIVE_INT);
+    status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, objtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+
+    /* ---------------------------------------------
+     *  Put testing objs in this group 
+     * create group contain dataset with attribute and the attribute has
+     * compound type which contain obj and region reference */
+    main_gid = H5Gcreate2(loc_id, "group_main", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (main_gid < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*----------------------------------------------------------
+     * create dataset which the attribute will be attached to
+     */
+    main_sid = H5Screate_simple(RANK_DSET, main_dset_dims, NULL);
+
+    main_did = H5Dcreate2(main_gid, "dset_main", H5T_NATIVE_INT, main_sid, H5P_DEFAULT,H5P_DEFAULT, H5P_DEFAULT);
+    
+    status = H5Dwrite(main_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------
+     * 1. create obj references in a attribute of compound type
+     */
+
+    /* 
+     * create compound type for attribute 
+     */
+    comp_objref_tid = H5Tcreate (H5T_COMPOUND, sizeof(comp_objref_t));
+
+    H5Tinsert(comp_objref_tid, "value_objref", HOFFSET(comp_objref_t, val_objref), H5T_STD_REF_OBJ);
+    H5Tinsert(comp_objref_tid, "value_int", HOFFSET(comp_objref_t, val_int), H5T_NATIVE_INT);
+
+    /*
+     * Create the object references into compound type
+     */
+     /* references to dataset */
+    status = H5Rcreate (&(comp_objref_data[0].val_objref), loc_id, NAME_OBJ_DS1, H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    comp_objref_data[0].val_int = 0;
+
+     /* references to group */
+    status = H5Rcreate (&(comp_objref_data[1].val_objref), loc_id, NAME_OBJ_GRP, H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    comp_objref_data[1].val_int = 10;
+
+     /* references to datatype */
+    status = H5Rcreate (&(comp_objref_data[2].val_objref), loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT,(hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    comp_objref_data[2].val_int = 20;
+    
+    /* 
+     * create attribute and write the object ref
+     */
+    comp_objref_attr_sid = H5Screate_simple (RANK_COMP_OBJREF, comp_objref_dim, NULL);
+    comp_objref_aid = H5Acreate2 (main_did, "Comp_OBJREF", comp_objref_tid, comp_objref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite (comp_objref_aid, comp_objref_tid, comp_objref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------
+     * 2. create region references in attribute of compound type
+     */
+    /*
+     * create compound type for attribute
+     */
+    comp_regref_tid = H5Tcreate (H5T_COMPOUND, sizeof(comp_regref_t));
+
+    H5Tinsert(comp_regref_tid, "value_regref", HOFFSET(comp_regref_t, val_regref), H5T_STD_REF_DSETREG);
+    H5Tinsert(comp_regref_tid, "value_int", HOFFSET(comp_regref_t, val_int), H5T_NATIVE_INT);
+
+    /*
+     * create the region reference 
+     */
+    status = H5Sselect_elements (objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    status = H5Rcreate (&(comp_regref_data[0].val_regref), loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    comp_regref_data[0].val_int = 10;
+
+    /*
+     * create attribute and write the region ref
+     */
+    comp_regref_attr_sid = H5Screate_simple (RANK_COMP_REGREF, comp_regref_dim, NULL);
+    comp_regref_aid = H5Acreate2 (main_did, "Comp_REGREF", comp_regref_tid, comp_regref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite (comp_regref_aid, comp_regref_tid, comp_regref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+
+    /*-------------------------------------------------------------------
+     * 3. create obj references in attribute of vlen type
+     */
+    /*
+     * prepare vlen data
+     */
+     vlen_objref_data[0].len = LEN0_VLEN_OBJREF;
+     vlen_objref_data[0].p = HDmalloc (vlen_objref_data[0].len * sizeof(hobj_ref_t));
+     vlen_objref_data[1].len = LEN1_VLEN_OBJREF;
+     vlen_objref_data[1].p = HDmalloc (vlen_objref_data[1].len * sizeof(hobj_ref_t));
+     vlen_objref_data[2].len = LEN2_VLEN_OBJREF;
+     vlen_objref_data[2].p = HDmalloc (vlen_objref_data[2].len * sizeof(hobj_ref_t));
+
+     /* 
+      * create obj references 
+      */
+     /* reference to dataset */
+     status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+     /* reference to group */
+     status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[1].p)[0], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1); 
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+     /* reference to datatype */
+     status = H5Rcreate (&((hobj_ref_t*)vlen_objref_data[2].p)[0], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+     
+     /* 
+      * create vlen type with obj reference
+      */
+     vlen_objref_attr_tid = H5Tvlen_create (H5T_STD_REF_OBJ);
+     vlen_objref_attr_sid = H5Screate_simple (RANK_VLEN_OBJREF, vlen_objref_dims, NULL);
+
+     /*
+     * create attribute and write the object reference 
+     */
+     vlen_objref_attr_id = H5Acreate2(main_did, "Vlen_OBJREF", vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
+     status = H5Awrite (vlen_objref_attr_id, vlen_objref_attr_tid, vlen_objref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /* close resource for vlen data */
+    status = H5Dvlen_reclaim (vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+    /*-------------------------------------------------------------------
+     * 4. create region references in a attribute of vlen type
+     */
+     
+    /*
+     * prepare vlen data
+     */
+    vlen_regref_data[0].len = LEN0_VLEN_REGREF;
+    vlen_regref_data[0].p = HDmalloc (vlen_regref_data[0].len * sizeof(hdset_reg_ref_t));
+
+    /*
+     * create region reference 
+     */
+    status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    status = H5Rcreate (&((hdset_reg_ref_t*)vlen_regref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    
+    /* 
+     * create vlen type with region reference
+     */
+    vlen_regref_attr_tid = H5Tvlen_create(H5T_STD_REF_DSETREG);
+    vlen_regref_attr_sid = H5Screate_simple(RANK_VLEN_REGREF, vlen_regref_dim, NULL);
+    
+    /*
+     * create attribute and write the region reference 
+     */
+    vlen_regref_attr_id = H5Acreate2(main_did, "Vlen_REGREF", vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, H5P_DEFAULT);
+    status = H5Awrite(vlen_regref_attr_id, vlen_regref_attr_tid, vlen_regref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+    
+    /* close resource for vlen data */
+    status = H5Dvlen_reclaim (vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data);
+    if (status < 0)
+    {
+        fprintf(stderr, "Error: %s %d> H5Dvlen_reclaim failed.\n", FUNC, __LINE__);
+        ret = FAIL;
+        goto out;
+    }
+
+out:
+    /* release resources */
+    if (objgid > 0)
+        H5Gclose(objgid);
+    if (objsid > 0)
+        H5Sclose(objsid);
+    if (objdid > 0)
+        H5Dclose(objdid);
+    if (objtid > 0)
+        H5Tclose(objtid);
+
+    if (main_gid > 0)
+        H5Gclose(main_gid);
+    if (main_sid > 0)
+        H5Sclose(main_sid);
+    if (main_did > 0)
+        H5Dclose(main_did);
+    /* comp obj ref */
+    if (comp_objref_tid > 0)
+        H5Tclose(comp_objref_tid);
+    if (comp_objref_aid > 0)
+        H5Aclose(comp_objref_aid);
+    if (comp_objref_attr_sid > 0)
+        H5Sclose(comp_objref_attr_sid);
+    /* comp region ref */
+    if (comp_regref_tid > 0)
+        H5Tclose(comp_regref_tid);
+    if (comp_regref_aid > 0)
+        H5Aclose(comp_regref_aid);
+    if (comp_regref_attr_sid > 0)
+        H5Sclose(comp_regref_attr_sid);
+    /* vlen obj ref */
+    if (vlen_objref_attr_id > 0)
+        H5Aclose(vlen_objref_attr_id);
+    if (vlen_objref_attr_sid > 0)
+        H5Sclose(vlen_objref_attr_sid);
+    if (vlen_objref_attr_tid > 0)
+        H5Tclose(vlen_objref_attr_tid);
+    /* vlen region ref */
+    if (vlen_regref_attr_id > 0)
+        H5Aclose(vlen_regref_attr_id);
+    if (vlen_regref_attr_sid > 0)
+        H5Sclose(vlen_regref_attr_sid);
+    if (vlen_regref_attr_tid > 0)
+        H5Tclose(vlen_regref_attr_tid);
+
+    return ret;
+}
diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
new file mode 100644
index 0000000..fab9494
--- /dev/null
+++ b/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
@@ -0,0 +1,112 @@
+HDF5 "out-vds_dset_chunk20x10x5.1_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( H5S_UNLIMITED, 18, 8 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 20, 10, 5 )
+      SIZE 16000
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+   DATA {
+   (0,0,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,2,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,3,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,6,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,7,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,8,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,9,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,10,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,11,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,12,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,13,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,14,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,15,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,16,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,17,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (1,0,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,2,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,3,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,6,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,7,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,8,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,9,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,10,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,11,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,12,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,13,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,14,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,15,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,16,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,17,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (2,0,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,2,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,3,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,6,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,7,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,8,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,9,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,10,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,11,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,12,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,13,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,14,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,15,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,16,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,17,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (3,0,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,2,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,3,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,6,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,7,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,8,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,9,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,10,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,11,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,12,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,13,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,14,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,15,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,16,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,17,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (4,0,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,2,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,3,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,6,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,7,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,8,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,9,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,10,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,11,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,12,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,13,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,14,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,15,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,16,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,17,0): 64, 64, 64, 64, 64, 64, 64, 64
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
new file mode 100644
index 0000000..51df9dd
--- /dev/null
+++ b/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
@@ -0,0 +1,70 @@
+HDF5 "out-vds_chunk3x6x9.2_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 6, 8, 14 ) / ( H5S_UNLIMITED, 8, 14 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 3, 6, 9 )
+      SIZE 5184
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+   DATA {
+   (0,0,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
+   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
+   (0,2,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,3,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 40, 40, 40, 40, 40, 40, 40,
+   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 50, 50, 50, 50, 50, 50, 50,
+   (0,6,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
+   (0,7,0): 30, 30, 30, 30, 30, 30, 30, 50, 50, 50, 50, 50, 50, 50,
+   (1,0,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
+   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 41, 41, 41, 41, 41, 41, 41,
+   (1,2,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,3,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 41, 41, 41, 41, 41, 41, 41,
+   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 51, 51, 51, 51, 51, 51, 51,
+   (1,6,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
+   (1,7,0): 31, 31, 31, 31, 31, 31, 31, 51, 51, 51, 51, 51, 51, 51,
+   (2,0,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
+   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 42, 42, 42, 42, 42, 42, 42,
+   (2,2,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,3,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 42, 42, 42, 42, 42, 42, 42,
+   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 52, 52, 52, 52, 52, 52, 52,
+   (2,6,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
+   (2,7,0): 32, 32, 32, 32, 32, 32, 32, 52, 52, 52, 52, 52, 52, 52,
+   (3,0,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
+   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 43, 43, 43, 43, 43, 43, 43,
+   (3,2,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,3,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 43, 43, 43, 43, 43, 43, 43,
+   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 53, 53, 53, 53, 53, 53, 53,
+   (3,6,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
+   (3,7,0): 33, 33, 33, 33, 33, 33, 33, 53, 53, 53, 53, 53, 53, 53,
+   (4,0,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
+   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 44, 44, 44, 44, 44, 44, 44,
+   (4,2,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,3,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 44, 44, 44, 44, 44, 44, 44,
+   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 54, 54, 54, 54, 54, 54, 54,
+   (4,6,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
+   (4,7,0): 34, 34, 34, 34, 34, 34, 34, 54, 54, 54, 54, 54, 54, 54,
+   (5,0,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
+   (5,1,0): 15, 15, 15, 15, 15, 15, 15, 45, 45, 45, 45, 45, 45, 45,
+   (5,2,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,3,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,4,0): 25, 25, 25, 25, 25, 25, 25, 45, 45, 45, 45, 45, 45, 45,
+   (5,5,0): 25, 25, 25, 25, 25, 25, 25, 55, 55, 55, 55, 55, 55, 55,
+   (5,6,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55,
+   (5,7,0): 35, 35, 35, 35, 35, 35, 35, 55, 55, 55, 55, 55, 55, 55
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
new file mode 100644
index 0000000..dcd172c
--- /dev/null
+++ b/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
@@ -0,0 +1,147 @@
+HDF5 "out-vds_chunk2x5x8.3_1_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 5, 25, 8 ) / ( H5S_UNLIMITED, 25, 8 ) }
+   STORAGE_LAYOUT {
+      CHUNKED ( 2, 5, 8 )
+      SIZE 4800
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_INCR
+   }
+   DATA {
+   (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,2,0): 10, 10, 10, 10, 10, 10, 10, 10,
+   (0,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,4,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,5,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,6,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,7,0): 20, 20, 20, 20, 20, 20, 20, 20,
+   (0,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,9,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,10,0): 30, 30, 30, 30, 30, 30, 30, 30,
+   (0,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,12,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,13,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,14,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,15,0): 40, 40, 40, 40, 40, 40, 40, 40,
+   (0,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,17,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,18,0): 50, 50, 50, 50, 50, 50, 50, 50,
+   (0,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (0,20,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,21,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,22,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,23,0): 60, 60, 60, 60, 60, 60, 60, 60,
+   (0,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,1,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,2,0): 11, 11, 11, 11, 11, 11, 11, 11,
+   (1,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,4,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,5,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,6,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,7,0): 21, 21, 21, 21, 21, 21, 21, 21,
+   (1,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,9,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,10,0): 31, 31, 31, 31, 31, 31, 31, 31,
+   (1,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,12,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,13,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,14,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,15,0): 41, 41, 41, 41, 41, 41, 41, 41,
+   (1,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,17,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,18,0): 51, 51, 51, 51, 51, 51, 51, 51,
+   (1,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (1,20,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,21,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,22,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,23,0): 61, 61, 61, 61, 61, 61, 61, 61,
+   (1,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,1,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,2,0): 12, 12, 12, 12, 12, 12, 12, 12,
+   (2,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,4,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,5,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,6,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,7,0): 22, 22, 22, 22, 22, 22, 22, 22,
+   (2,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,9,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,10,0): 32, 32, 32, 32, 32, 32, 32, 32,
+   (2,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,12,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,13,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,14,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,15,0): 42, 42, 42, 42, 42, 42, 42, 42,
+   (2,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,17,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,18,0): 52, 52, 52, 52, 52, 52, 52, 52,
+   (2,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (2,20,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,21,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,22,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,23,0): 62, 62, 62, 62, 62, 62, 62, 62,
+   (2,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,1,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,2,0): 13, 13, 13, 13, 13, 13, 13, 13,
+   (3,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,4,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,5,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,6,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,7,0): 23, 23, 23, 23, 23, 23, 23, 23,
+   (3,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,9,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,10,0): 33, 33, 33, 33, 33, 33, 33, 33,
+   (3,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,12,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,13,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,14,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,15,0): 43, 43, 43, 43, 43, 43, 43, 43,
+   (3,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,17,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,18,0): 53, 53, 53, 53, 53, 53, 53, 53,
+   (3,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (3,20,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,21,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,22,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,23,0): 63, 63, 63, 63, 63, 63, 63, 63,
+   (3,24,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,1,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,2,0): 14, 14, 14, 14, 14, 14, 14, 14,
+   (4,3,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,4,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,5,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,6,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,7,0): 24, 24, 24, 24, 24, 24, 24, 24,
+   (4,8,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,9,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,10,0): 34, 34, 34, 34, 34, 34, 34, 34,
+   (4,11,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,12,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,13,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,14,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,15,0): 44, 44, 44, 44, 44, 44, 44, 44,
+   (4,16,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,17,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,18,0): 54, 54, 54, 54, 54, 54, 54, 54,
+   (4,19,0): -9, -9, -9, -9, -9, -9, -9, -9,
+   (4,20,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,21,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,22,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,23,0): 64, 64, 64, 64, 64, 64, 64, 64,
+   (4,24,0): -9, -9, -9, -9, -9, -9, -9, -9
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
new file mode 100644
index 0000000..1e8927c
--- /dev/null
+++ b/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
@@ -0,0 +1,58 @@
+HDF5 "out-vds_compa.4_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
+   STORAGE_LAYOUT {
+      COMPACT
+      SIZE 576
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_EARLY
+   }
+   DATA {
+   (0,0,0): 10, 10, 10, 10,
+   (0,1,0): 10, 10, 10, 10,
+   (0,2,0): 10, 10, 10, 10,
+   (0,3,0): 10, 10, 10, 10,
+   (1,0,0): 11, 11, 11, 11,
+   (1,1,0): 11, 11, 11, 11,
+   (1,2,0): 11, 11, 11, 11,
+   (1,3,0): 11, 11, 11, 11,
+   (2,0,0): 12, 12, 12, 12,
+   (2,1,0): 12, 12, 12, 12,
+   (2,2,0): 12, 12, 12, 12,
+   (2,3,0): 12, 12, 12, 12,
+   (3,0,0): 20, 20, 20, 20,
+   (3,1,0): 20, 20, 20, 20,
+   (3,2,0): 20, 20, 20, 20,
+   (3,3,0): 20, 20, 20, 20,
+   (4,0,0): 21, 21, 21, 21,
+   (4,1,0): 21, 21, 21, 21,
+   (4,2,0): 21, 21, 21, 21,
+   (4,3,0): 21, 21, 21, 21,
+   (5,0,0): 22, 22, 22, 22,
+   (5,1,0): 22, 22, 22, 22,
+   (5,2,0): 22, 22, 22, 22,
+   (5,3,0): 22, 22, 22, 22,
+   (6,0,0): 30, 30, 30, 30,
+   (6,1,0): 30, 30, 30, 30,
+   (6,2,0): 30, 30, 30, 30,
+   (6,3,0): 30, 30, 30, 30,
+   (7,0,0): 31, 31, 31, 31,
+   (7,1,0): 31, 31, 31, 31,
+   (7,2,0): 31, 31, 31, 31,
+   (7,3,0): 31, 31, 31, 31,
+   (8,0,0): 32, 32, 32, 32,
+   (8,1,0): 32, 32, 32, 32,
+   (8,2,0): 32, 32, 32, 32,
+   (8,3,0): 32, 32, 32, 32
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
new file mode 100644
index 0000000..c499b35
--- /dev/null
+++ b/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
@@ -0,0 +1,59 @@
+HDF5 "out-vds_conti.4_vds.h5" {
+DATASET "vds_dset" {
+   DATATYPE  H5T_STD_I32LE
+   DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( 9, 4, 4 ) }
+   STORAGE_LAYOUT {
+      CONTIGUOUS
+      SIZE 576
+      OFFSET 2144
+   }
+   FILTERS {
+      NONE
+   }
+   FILLVALUE {
+      FILL_TIME H5D_FILL_TIME_IFSET
+      VALUE  -9
+   }
+   ALLOCATION_TIME {
+      H5D_ALLOC_TIME_LATE
+   }
+   DATA {
+   (0,0,0): 10, 10, 10, 10,
+   (0,1,0): 10, 10, 10, 10,
+   (0,2,0): 10, 10, 10, 10,
+   (0,3,0): 10, 10, 10, 10,
+   (1,0,0): 11, 11, 11, 11,
+   (1,1,0): 11, 11, 11, 11,
+   (1,2,0): 11, 11, 11, 11,
+   (1,3,0): 11, 11, 11, 11,
+   (2,0,0): 12, 12, 12, 12,
+   (2,1,0): 12, 12, 12, 12,
+   (2,2,0): 12, 12, 12, 12,
+   (2,3,0): 12, 12, 12, 12,
+   (3,0,0): 20, 20, 20, 20,
+   (3,1,0): 20, 20, 20, 20,
+   (3,2,0): 20, 20, 20, 20,
+   (3,3,0): 20, 20, 20, 20,
+   (4,0,0): 21, 21, 21, 21,
+   (4,1,0): 21, 21, 21, 21,
+   (4,2,0): 21, 21, 21, 21,
+   (4,3,0): 21, 21, 21, 21,
+   (5,0,0): 22, 22, 22, 22,
+   (5,1,0): 22, 22, 22, 22,
+   (5,2,0): 22, 22, 22, 22,
+   (5,3,0): 22, 22, 22, 22,
+   (6,0,0): 30, 30, 30, 30,
+   (6,1,0): 30, 30, 30, 30,
+   (6,2,0): 30, 30, 30, 30,
+   (6,3,0): 30, 30, 30, 30,
+   (7,0,0): 31, 31, 31, 31,
+   (7,1,0): 31, 31, 31, 31,
+   (7,2,0): 31, 31, 31, 31,
+   (7,3,0): 31, 31, 31, 31,
+   (8,0,0): 32, 32, 32, 32,
+   (8,1,0): 32, 32, 32, 32,
+   (8,2,0): 32, 32, 32, 32,
+   (8,3,0): 32, 32, 32, 32
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/README b/tools/test/h5repack/testfiles/README
new file mode 100644
index 0000000..4096dee
--- /dev/null
+++ b/tools/test/h5repack/testfiles/README
@@ -0,0 +1,5 @@
+h5repack_nested_8bit_enum_deflated.h5:
+h5repack_nested_8bit_enum.h5:
+    enuberated 8bit type nested in compount type.  Original file provided
+    by a user (HDFFV-8667) as a test file. Used h5copy to extract only the
+    Compound type dataset. The non-deflated version is produced by h5repack.
diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
new file mode 100644
index 0000000..75f54fa
--- /dev/null
+++ b/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
@@ -0,0 +1,130 @@
+HDF5 "out-deflate_limit.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 1283 (2.494:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 1150 (2.783:1 COMPRESSION)
+      }
+      FILTERS {
+         COMPRESSION DEFLATE { LEVEL 1 }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/testfiles/h5repack-help.txt
new file mode 100644
index 0000000..049e27d
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack-help.txt
@@ -0,0 +1,125 @@
+usage: h5repack [OPTIONS] file1 file2
+  file1                    Input HDF5 File
+  file2                    Output HDF5 File
+  OPTIONS
+   -h, --help              Print a usage message and exit
+   -v, --verbose           Verbose mode, print object information
+   -V, --version           Print version number and exit
+   -n, --native            Use a native HDF5 type when repacking
+   -L, --latest            Use latest version of file format
+   -c L1, --compact=L1     Maximum number of links in header messages
+   -d L2, --indexed=L2     Minimum number of links in the indexed format
+   -s S[:F], --ssize=S[:F] Shared object header message minimum size
+   -m M, --minimum=M       Do not apply the filter to datasets smaller than M
+   -e E, --file=E          Name of file E with the -f and -l options
+   -u U, --ublock=U        Name of file U with user block data to be added
+   -b B, --block=B         Size of user block to be added
+   -M A, --metadata_block_size=A  Metadata block size for H5Pset_meta_block_size
+   -t T, --threshold=T     Threshold value for H5Pset_alignment
+   -a A, --alignment=A     Alignment value for H5Pset_alignment
+   -f FILT, --filter=FILT  Filter type
+   -l LAYT, --layout=LAYT  Layout type
+   -S FS_STRGY, --fs_strategy=FS_STRGY  File space management strategy
+   -T FS_THRD, --fs_threshold=FS_THRD   Free-space section threshold
+
+    M - is an integer greater than 1, size of dataset in bytes (default is 0) 
+    E - is a filename.
+    S - is an integer
+    U - is a filename.
+    T - is an integer
+    A - is an integer greater than zero
+    B - is the user block size, any value that is 512 or greater and is
+        a power of 2 (1024 default)
+    F - is the shared object header message type, any of <dspace|dtype|fill|
+        pline|attr>. If F is not specified, S applies to all messages
+
+     --enable-error-stack Prints messages from the HDF5 error stack as they
+                          occur.
+
+    FS_STRGY is the file space management strategy to use for the output file.
+             It is a string as listed below:
+        ALL_PERSIST - Use persistent free-space managers, aggregators and virtual file driver
+                      for file space allocation
+        ALL - Use non-persistent free-space managers, aggregators and virtual file driver
+              for file space allocation
+        AGGR_VFD - Use aggregators and virtual file driver for file space allocation
+        VFD - Use virtual file driver for file space allocation
+
+    FS_THRD is the free-space section threshold to use for the output file.
+            It is the minimum size (in bytes) of free-space sections to be tracked
+            by the the library's free-space managers.
+
+    FILT - is a string with the format:
+
+      <list of objects>:<name of filter>=<filter parameters>
+
+      <list of objects> is a comma separated list of object names, meaning apply
+        compression only to those objects. If no names are specified, the filter
+        is applied to all objects
+      <name of filter> can be:
+        GZIP, to apply the HDF5 GZIP filter (GZIP compression)
+        SZIP, to apply the HDF5 SZIP filter (SZIP compression)
+        SHUF, to apply the HDF5 shuffle filter
+        FLET, to apply the HDF5 checksum filter
+        NBIT, to apply the HDF5 NBIT filter (NBIT compression)
+        SOFF, to apply the HDF5 Scale/Offset filter
+        UD,   to apply a user defined filter
+        NONE, to remove all filters
+      <filter parameters> is optional filter parameter information
+        GZIP=<deflation level> from 1-9
+        SZIP=<pixels per block,coding> pixels per block is a even number in
+            2-32 and coding method is either EC or NN
+        SHUF (no parameter)
+        FLET (no parameter)
+        NBIT (no parameter)
+        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
+            is either IN or DS
+        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>
+            required values for filter_number,cd_value_count,value_1
+            optional values for value_2 to value_N
+        NONE (no parameter)
+
+    LAYT - is a string with the format:
+
+      <list of objects>:<layout type>=<layout parameters>
+
+      <list of objects> is a comma separated list of object names, meaning that
+        layout information is supplied for those objects. If no names are
+        specified, the layout type is applied to all objects
+      <layout type> can be:
+        CHUNK, to apply chunking layout
+        COMPA, to apply compact layout
+        CONTI, to apply contiguous layout
+      <layout parameters> is optional layout information
+        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension
+        COMPA (no parameter)
+        CONTI (no parameter)
+
+Examples of use:
+
+1) h5repack -v -f GZIP=1 file1 file2
+
+   GZIP compression with level 1 to all objects
+
+2) h5repack -v -f dset1:SZIP=8,NN file1 file2
+
+   SZIP compression with 8 pixels per block and NN coding method to object dset1
+
+3) h5repack -v -l dset1,dset2:CHUNK=20x10 -f dset3,dset4,dset5:NONE file1 file2
+
+   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2
+   and remove filters to objects dset3, dset4, dset5
+
+4) h5repack -L -c 10 -s 20:dtype file1 file2 
+
+   Using latest file format with maximum compact group size of 10 and
+   and minimum shared datatype size of 20
+
+5) h5repack -f SHUF -f GZIP=1 file1 file2 
+
+   Add both filters SHUF and GZIP in this order to all datasets
+
+6) h5repack -f UD=307,1,9 file1 file2 
+
+   Add bzip2 filter to all datasets
+
diff --git a/tools/test/h5repack/testfiles/h5repack.info b/tools/test/h5repack/testfiles/h5repack.info
new file mode 100644
index 0000000..216948d
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack.info
@@ -0,0 +1 @@
+-l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1
diff --git a/tools/test/h5repack/testfiles/h5repack_attr.h5 b/tools/test/h5repack/testfiles/h5repack_attr.h5
new file mode 100644
index 0000000..80df0be
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_attr.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_attr_refs.h5 b/tools/test/h5repack/testfiles/h5repack_attr_refs.h5
new file mode 100644
index 0000000..1b0ca34
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_attr_refs.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_deflate.h5 b/tools/test/h5repack/testfiles/h5repack_deflate.h5
new file mode 100644
index 0000000..4988491
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_deflate.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_early.h5 b/tools/test/h5repack/testfiles/h5repack_early.h5
new file mode 100644
index 0000000..d9a7ece
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_early.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_ext.bin b/tools/test/h5repack/testfiles/h5repack_ext.bin
new file mode 100644
index 0000000..f858094
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_ext.bin
diff --git a/tools/test/h5repack/testfiles/h5repack_ext.h5 b/tools/test/h5repack/testfiles/h5repack_ext.h5
new file mode 100644
index 0000000..8518b5b
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_ext.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_fill.h5 b/tools/test/h5repack/testfiles/h5repack_fill.h5
new file mode 100644
index 0000000..ac40089
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_fill.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5 b/tools/test/h5repack/testfiles/h5repack_filters.h5
new file mode 100644
index 0000000..eabade8
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_filters.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
new file mode 100644
index 0000000..36e65b9
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
@@ -0,0 +1,13 @@
+Objects to modify layout are...
+Objects to apply filter are...
+ </dset_deflate> with GZIP filter
+ </dset_deflate>...Found
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+ dset                        /dset_all
+ dset     GZIP   (0.995:1)   /dset_deflate
+ dset                        /dset_fletcher32
+ dset                        /dset_nbit
+ dset                        /dset_shuffle
diff --git a/tools/test/h5repack/testfiles/h5repack_fletcher.h5 b/tools/test/h5repack/testfiles/h5repack_fletcher.h5
new file mode 100644
index 0000000..16ca4ef
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_fletcher.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_hlink.h5 b/tools/test/h5repack/testfiles/h5repack_hlink.h5
new file mode 100644
index 0000000..80c0fcc
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_hlink.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5 b/tools/test/h5repack/testfiles/h5repack_layout.UD.h5
new file mode 100644
index 0000000..caf2024
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.UD.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
new file mode 100644
index 0000000..66c4c69
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
@@ -0,0 +1,130 @@
+HDF5 "out-plugin_none.h5repack_layout.UD.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200
+      }
+      FILTERS {
+         NONE
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5 b/tools/test/h5repack/testfiles/h5repack_layout.h5
new file mode 100644
index 0000000..4e53766
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
new file mode 100644
index 0000000..95cc4c6
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -0,0 +1,38 @@
+HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
+  #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+    major: Links
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5L_create_real(): can't insert link
+    major: Symbol table
+    minor: Unable to insert object
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+    major: Symbol table
+    minor: Object not found
+  #005: (file name) line (number) in H5G_traverse_real(): traversal operator failed
+    major: Symbol table
+    minor: Callback failed
+  #006: (file name) line (number) in H5L_link_cb(): unable to create object
+    major: Object header
+    minor: Unable to initialize object
+  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+    major: Object header
+    minor: Can't open object
+  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #009: (file name) line (number) in H5D__create(): unable to construct layout information
+    major: Dataset
+    minor: Unable to initialize object
+  #010: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+    major: Dataset
+    minor: Bad value
+H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
+  #000: (file name) line (number) in do_copy_objects(): H5Dcreate2 failed
+    major: Failure in tools library
+    minor: error in function
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
new file mode 100644
index 0000000..a8b4562
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
@@ -0,0 +1,158 @@
+HDF5 "out-plugin_test.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 257
+            COMMENT dynlib1
+            PARAMS { 9 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
new file mode 100644
index 0000000..3d09e14
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
@@ -0,0 +1,158 @@
+HDF5 "out-plugin_version_test.h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 20, 10 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      STORAGE_LAYOUT {
+         CHUNKED ( 40, 20 )
+         SIZE 3200 (1.000:1 COMPRESSION)
+      }
+      FILTERS {
+         USER_DEFINED_FILTER {
+            FILTER_ID 260
+            COMMENT dynlib4
+            PARAMS { 9 1 9 235 }
+         }
+      }
+      FILLVALUE {
+         FILL_TIME H5D_FILL_TIME_IFSET
+         VALUE  H5D_FILL_VALUE_DEFAULT
+      }
+      ALLOCATION_TIME {
+         H5D_ALLOC_TIME_INCR
+      }
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
new file mode 100644
index 0000000..0993d5b
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.tst
@@ -0,0 +1,9 @@
+Objects to modify layout are...
+Objects to apply filter are...
+ User Defined 250
+Making file <out-plugin_zero.h5repack_layout.h5>...
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+h5repack error: <h5repack_layout.h5>: Could not copy data to: out-plugin_zero.h5repack_layout.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
new file mode 100644
index 0000000..00c74f4
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
@@ -0,0 +1,606 @@
+HDF5 "h5repack_layout.h5" {
+GROUP "/" {
+   DATASET "dset1" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset3" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset4" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset_chunk" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, H5S_UNLIMITED ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset_compact" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+   DATASET "dset_contiguous" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 40, 20 ) / ( 40, 20 ) }
+      DATA {
+      (0,0): 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+      (0,18): 18, 19,
+      (1,0): 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+      (1,16): 36, 37, 38, 39,
+      (2,0): 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+      (2,16): 56, 57, 58, 59,
+      (3,0): 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
+      (3,16): 76, 77, 78, 79,
+      (4,0): 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+      (4,16): 96, 97, 98, 99,
+      (5,0): 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+      (5,13): 113, 114, 115, 116, 117, 118, 119,
+      (6,0): 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+      (6,13): 133, 134, 135, 136, 137, 138, 139,
+      (7,0): 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+      (7,13): 153, 154, 155, 156, 157, 158, 159,
+      (8,0): 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172,
+      (8,13): 173, 174, 175, 176, 177, 178, 179,
+      (9,0): 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+      (9,13): 193, 194, 195, 196, 197, 198, 199,
+      (10,0): 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+      (10,12): 212, 213, 214, 215, 216, 217, 218, 219,
+      (11,0): 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
+      (11,12): 232, 233, 234, 235, 236, 237, 238, 239,
+      (12,0): 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251,
+      (12,12): 252, 253, 254, 255, 256, 257, 258, 259,
+      (13,0): 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
+      (13,12): 272, 273, 274, 275, 276, 277, 278, 279,
+      (14,0): 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291,
+      (14,12): 292, 293, 294, 295, 296, 297, 298, 299,
+      (15,0): 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
+      (15,12): 312, 313, 314, 315, 316, 317, 318, 319,
+      (16,0): 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
+      (16,12): 332, 333, 334, 335, 336, 337, 338, 339,
+      (17,0): 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351,
+      (17,12): 352, 353, 354, 355, 356, 357, 358, 359,
+      (18,0): 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371,
+      (18,12): 372, 373, 374, 375, 376, 377, 378, 379,
+      (19,0): 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391,
+      (19,12): 392, 393, 394, 395, 396, 397, 398, 399,
+      (20,0): 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411,
+      (20,12): 412, 413, 414, 415, 416, 417, 418, 419,
+      (21,0): 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+      (21,12): 432, 433, 434, 435, 436, 437, 438, 439,
+      (22,0): 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
+      (22,12): 452, 453, 454, 455, 456, 457, 458, 459,
+      (23,0): 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471,
+      (23,12): 472, 473, 474, 475, 476, 477, 478, 479,
+      (24,0): 480, 481, 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
+      (24,12): 492, 493, 494, 495, 496, 497, 498, 499,
+      (25,0): 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511,
+      (25,12): 512, 513, 514, 515, 516, 517, 518, 519,
+      (26,0): 520, 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, 531,
+      (26,12): 532, 533, 534, 535, 536, 537, 538, 539,
+      (27,0): 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551,
+      (27,12): 552, 553, 554, 555, 556, 557, 558, 559,
+      (28,0): 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571,
+      (28,12): 572, 573, 574, 575, 576, 577, 578, 579,
+      (29,0): 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591,
+      (29,12): 592, 593, 594, 595, 596, 597, 598, 599,
+      (30,0): 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
+      (30,12): 612, 613, 614, 615, 616, 617, 618, 619,
+      (31,0): 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+      (31,12): 632, 633, 634, 635, 636, 637, 638, 639,
+      (32,0): 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651,
+      (32,12): 652, 653, 654, 655, 656, 657, 658, 659,
+      (33,0): 660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671,
+      (33,12): 672, 673, 674, 675, 676, 677, 678, 679,
+      (34,0): 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691,
+      (34,12): 692, 693, 694, 695, 696, 697, 698, 699,
+      (35,0): 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 711,
+      (35,12): 712, 713, 714, 715, 716, 717, 718, 719,
+      (36,0): 720, 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, 731,
+      (36,12): 732, 733, 734, 735, 736, 737, 738, 739,
+      (37,0): 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751,
+      (37,12): 752, 753, 754, 755, 756, 757, 758, 759,
+      (38,0): 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771,
+      (38,12): 772, 773, 774, 775, 776, 777, 778, 779,
+      (39,0): 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791,
+      (39,12): 792, 793, 794, 795, 796, 797, 798, 799
+      }
+   }
+}
+}
diff --git a/tools/test/h5repack/testfiles/h5repack_layout2.h5 b/tools/test/h5repack/testfiles/h5repack_layout2.h5
new file mode 100644
index 0000000..f6821e5
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout2.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layout3.h5 b/tools/test/h5repack/testfiles/h5repack_layout3.h5
new file mode 100644
index 0000000..6d2de41
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layout3.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_layouto.h5 b/tools/test/h5repack/testfiles/h5repack_layouto.h5
new file mode 100644
index 0000000..a038e68
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_layouto.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_named_dtypes.h5 b/tools/test/h5repack/testfiles/h5repack_named_dtypes.h5
new file mode 100644
index 0000000..85c1352
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_named_dtypes.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_nbit.h5 b/tools/test/h5repack/testfiles/h5repack_nbit.h5
new file mode 100644
index 0000000..ac71bee
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_nbit.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum.h5 b/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum.h5
new file mode 100644
index 0000000..f1bd8e9
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5 b/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5
new file mode 100644
index 0000000..2e66da2
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_nested_8bit_enum_deflated.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_objs.h5 b/tools/test/h5repack/testfiles/h5repack_objs.h5
new file mode 100644
index 0000000..284b0ac
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_objs.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_refs.h5 b/tools/test/h5repack/testfiles/h5repack_refs.h5
new file mode 100644
index 0000000..2a1ec9b
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_refs.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_shuffle.h5 b/tools/test/h5repack/testfiles/h5repack_shuffle.h5
new file mode 100644
index 0000000..c14e2cb
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_shuffle.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_soffset.h5 b/tools/test/h5repack/testfiles/h5repack_soffset.h5
new file mode 100644
index 0000000..2acd867
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_soffset.h5
diff --git a/tools/test/h5repack/testfiles/h5repack_szip.h5 b/tools/test/h5repack/testfiles/h5repack_szip.h5
new file mode 100644
index 0000000..b16d169
--- /dev/null
+++ b/tools/test/h5repack/testfiles/h5repack_szip.h5
diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
new file mode 100644
index 0000000..4fb6906
--- /dev/null
+++ b/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
@@ -0,0 +1,14 @@
+Objects to modify layout are...
+Objects to apply filter are...
+ Uncompress all
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+ dset       (1.000:1)        /dset1
+ dset       (1.000:1)        /dset2
+ dset       (1.000:1)        /dset3
+ dset       (1.000:1)        /dset4
+ dset       (1.000:1)        /dset_chunk
+ dset       (1.000:1)        /dset_compact
+ dset       (1.000:1)        /dset_contiguous
diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
new file mode 100644
index 0000000..7f9bd6e
--- /dev/null
+++ b/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
@@ -0,0 +1,14 @@
+Objects to modify layout are...
+Objects to apply filter are...
+ User Defined 257
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+ dset     UD   (1.000:1)     /dset1
+ dset     UD   (1.000:1)     /dset2
+ dset     UD   (1.000:1)     /dset3
+ dset     UD   (1.000:1)     /dset4
+ dset     UD   (1.000:1)     /dset_chunk
+ dset     UD   (1.000:1)     /dset_compact
+ dset     UD   (1.000:1)     /dset_contiguous
diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
new file mode 100644
index 0000000..1a496c6
--- /dev/null
+++ b/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
@@ -0,0 +1,14 @@
+Objects to modify layout are...
+Objects to apply filter are...
+ User Defined 260
+-----------------------------------------
+ Type     Filter (Compression)     Name
+-----------------------------------------
+ group                       /
+ dset     UD   (1.000:1)     /dset1
+ dset     UD   (1.000:1)     /dset2
+ dset     UD   (1.000:1)     /dset3
+ dset     UD   (1.000:1)     /dset4
+ dset     UD   (1.000:1)     /dset_chunk
+ dset     UD   (1.000:1)     /dset_compact
+ dset     UD   (1.000:1)     /dset_contiguous
diff --git a/tools/test/h5repack/testfiles/ublock.bin b/tools/test/h5repack/testfiles/ublock.bin
new file mode 100644
index 0000000..b2d03f3
--- /dev/null
+++ b/tools/test/h5repack/testfiles/ublock.bin
@@ -0,0 +1 @@
+abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrst
\ No newline at end of file
diff --git a/tools/test/h5repack/testh5repack_detect_szip.c b/tools/test/h5repack/testh5repack_detect_szip.c
new file mode 100644
index 0000000..e91b2f7
--- /dev/null
+++ b/tools/test/h5repack/testh5repack_detect_szip.c
@@ -0,0 +1,62 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include <stdio.h>
+#include "h5repack.h"
+#include "h5tools.h"
+#include "h5tools_utils.h"
+#include "h5test.h"
+
+
+/* Name of tool */
+#define PROGRAMNAME "h5repack_detect_szip"
+
+/*-------------------------------------------------------------------------
+ * Function: main
+ *
+ * Purpose: detects szip encoder, prints "yes" or "no" to stdout.
+ *          Intended to be used in test scripts.
+ *
+ * Return:
+ *
+ * Programmer:
+ *
+ * Date:
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+
+
+int main(void)
+{
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
+
+    /* Initialize h5tools lib */
+    h5tools_init();
+
+#ifdef H5_HAVE_FILTER_SZIP
+    if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
+        printf("yes\n");
+        return(1);
+    }
+#endif /* H5_HAVE_FILTER_SZIP */
+    printf("no\n");
+    return(0);
+}