[svn-r27195] Add h5dump cmake tests and files.

Add tools gen cmake files
move testfiles for pbits to subdir as well as vds

Tested: local linux

98 files changed, 2760 insertions, 268 deletions

diff --git a/MANIFEST b/MANIFEST
index 3089132..3922bc6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1177,6 +1177,7 @@
 ./tools/h5dump/testh5dump.sh.in
 ./tools/h5dump/testh5dumppbits.sh.in
 ./tools/h5dump/testh5dumpxml.sh.in
+./tools/h5dump/testh5dumpvds.sh.in
 ./tools/h5dump/binread.c
 
 ./tools/h5import/Makefile.am
@@ -1701,60 +1702,97 @@
 ./tools/h5dump/errfiles/tslink-D.err
 
 # h5dump packed bits validation
-./tools/testfiles/tnofilename-with-packed-bits.ddl
-./tools/testfiles/tpbitsLengthPositive.ddl
-./tools/testfiles/tpbitsMaxExceeded.ddl
-./tools/testfiles/tpbitsSigned.ddl
-./tools/testfiles/tpbitsSigned2.ddl
-./tools/testfiles/tpbitsSigned4.ddl
-./tools/testfiles/tpbitsSignedWhole.ddl
-./tools/testfiles/tpbitsSignedInt.ddl
-./tools/testfiles/tpbitsSignedInt4.ddl
-./tools/testfiles/tpbitsSignedInt8.ddl
-./tools/testfiles/tpbitsSignedIntWhole.ddl
-./tools/testfiles/tpbitsSignedLong.ddl
-./tools/testfiles/tpbitsSignedLong8.ddl
-./tools/testfiles/tpbitsSignedLong16.ddl
-./tools/testfiles/tpbitsSignedLongWhole.ddl
-./tools/testfiles/tpbitsSignedLongLong.ddl
-./tools/testfiles/tpbitsSignedLongLong16.ddl
-./tools/testfiles/tpbitsSignedLongLong32.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole1.ddl
-./tools/testfiles/tpbitsSignedLongLongWhole63.ddl
-./tools/testfiles/tpbitsOffsetNegative.ddl
-./tools/testfiles/tpbitsUnsigned.ddl
-./tools/testfiles/tpbitsUnsigned2.ddl
-./tools/testfiles/tpbitsUnsigned4.ddl
-./tools/testfiles/tpbitsUnsignedWhole.ddl
-./tools/testfiles/tpbitsUnsignedInt.ddl
-./tools/testfiles/tpbitsUnsignedInt4.ddl
-./tools/testfiles/tpbitsUnsignedInt8.ddl
-./tools/testfiles/tpbitsUnsignedIntWhole.ddl
-./tools/testfiles/tpbitsUnsignedLong.ddl
-./tools/testfiles/tpbitsUnsignedLong8.ddl
-./tools/testfiles/tpbitsUnsignedLong16.ddl
-./tools/testfiles/tpbitsUnsignedLongWhole.ddl
-./tools/testfiles/tpbitsUnsignedLongLong.ddl
-./tools/testfiles/tpbitsUnsignedLongLong16.ddl
-./tools/testfiles/tpbitsUnsignedLongLong32.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl
-./tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl
-./tools/testfiles/tpbitsMax.ddl
+./tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+./tools/testfiles/pbits/tpbitsLengthPositive.ddl
+./tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+./tools/testfiles/pbits/tpbitsSigned.ddl
+./tools/testfiles/pbits/tpbitsSigned2.ddl
+./tools/testfiles/pbits/tpbitsSigned4.ddl
+./tools/testfiles/pbits/tpbitsSignedWhole.ddl
+./tools/testfiles/pbits/tpbitsSignedInt.ddl
+./tools/testfiles/pbits/tpbitsSignedInt4.ddl
+./tools/testfiles/pbits/tpbitsSignedInt8.ddl
+./tools/testfiles/pbits/tpbitsSignedIntWhole.ddl
+./tools/testfiles/pbits/tpbitsSignedLong.ddl
+./tools/testfiles/pbits/tpbitsSignedLong8.ddl
+./tools/testfiles/pbits/tpbitsSignedLong16.ddl
+./tools/testfiles/pbits/tpbitsSignedLongWhole.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLong.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLong16.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLong32.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl
+./tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl
+./tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+./tools/testfiles/pbits/tpbitsUnsigned.ddl
+./tools/testfiles/pbits/tpbitsUnsigned2.ddl
+./tools/testfiles/pbits/tpbitsUnsigned4.ddl
+./tools/testfiles/pbits/tpbitsUnsignedWhole.ddl
+./tools/testfiles/pbits/tpbitsUnsignedInt.ddl
+./tools/testfiles/pbits/tpbitsUnsignedInt4.ddl
+./tools/testfiles/pbits/tpbitsUnsignedInt8.ddl
+./tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLong.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLong8.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLong16.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl
+./tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl
+./tools/testfiles/pbits/tpbitsMax.ddl
+./tools/testfiles/pbits/tpbitsArray.ddl
+./tools/testfiles/pbits/tpbitsCompound.ddl
+./tools/testfiles/pbits/tpbitsIncomplete.ddl
+./tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+./tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl
+./tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl
+./tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl
+./tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+./tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl
+./tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl
+./tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl
+./tools/testfiles/pbits/tpbitsOverlapped.ddl
 ./tools/testfiles/packedbits.h5
-./tools/testfiles/tpbitsArray.ddl
-./tools/testfiles/tpbitsCompound.ddl
-./tools/testfiles/tpbitsIncomplete.ddl
-./tools/testfiles/tpbitsLengthExceeded.ddl
-./tools/testfiles/tpbitsCharLengthExceeded.ddl
-./tools/testfiles/tpbitsIntLengthExceeded.ddl
-./tools/testfiles/tpbitsLongLengthExceeded.ddl
-./tools/testfiles/tpbitsOffsetExceeded.ddl
-./tools/testfiles/tpbitsCharOffsetExceeded.ddl
-./tools/testfiles/tpbitsIntOffsetExceeded.ddl
-./tools/testfiles/tpbitsLongOffsetExceeded.ddl
-./tools/testfiles/tpbitsOverlapped.ddl
+
+# h5dump vds validation
+./tools/testfiles/vds/tvds-1.ddl
+./tools/testfiles/vds/tvds-2.ddl
+./tools/testfiles/vds/tvds-3_1.ddl
+./tools/testfiles/vds/tvds-3_2.ddl
+./tools/testfiles/vds/tvds-4.ddl
+./tools/testfiles/vds/tvds-5.ddl
+./tools/testfiles/vds/tvds_layout-1.ddl
+./tools/testfiles/vds/tvds_layout-2.ddl
+./tools/testfiles/vds/tvds_layout-3_1.ddl
+./tools/testfiles/vds/tvds_layout-3_2.ddl
+./tools/testfiles/vds/tvds_layout-4.ddl
+./tools/testfiles/vds/tvds_layout-5.ddl
+./tools/testfiles/vds/1_a.h5
+./tools/testfiles/vds/1_b.h5
+./tools/testfiles/vds/1_c.h5
+./tools/testfiles/vds/1_d.h5
+./tools/testfiles/vds/1_e.h5
+./tools/testfiles/vds/1_f.h5
+./tools/testfiles/vds/1_vds.h5
+./tools/testfiles/vds/2_a.h5
+./tools/testfiles/vds/2_b.h5
+./tools/testfiles/vds/2_c.h5
+./tools/testfiles/vds/2_d.h5
+./tools/testfiles/vds/2_e.h5
+./tools/testfiles/vds/2_vds.h5
+./tools/testfiles/vds/3_1_vds.h5
+./tools/testfiles/vds/3_2_vds.h5
+./tools/testfiles/vds/4_0.h5
+./tools/testfiles/vds/4_1.h5
+./tools/testfiles/vds/4_2.h5
+./tools/testfiles/vds/4_vds.h5
+./tools/testfiles/vds/5_a.h5
+./tools/testfiles/vds/5_b.h5
+./tools/testfiles/vds/5_c.h5
+./tools/testfiles/vds/5_vds.h5
 
 # h5dump h5import validation
 ./tools/testfiles/out3.h5import
@@ -2517,6 +2555,7 @@
 ./tools/h5dump/CMakeTests.cmake
 ./tools/h5dump/CMakeTestsPBITS.cmake
 ./tools/h5dump/CMakeTestsXML.cmake
+./tools/h5dump/CMakeTestsVDS.cmake
 ./tools/h5import/CMakeLists.txt
 ./tools/h5import/CMakeTests.cmake
 ./tools/h5jam/CMakeLists.txt
@@ -2530,6 +2569,7 @@
 ./tools/lib/CMakeLists.txt
 ./tools/misc/CMakeLists.txt
 ./tools/misc/CMakeTests.cmake
+./tools/misc/vds/CMakeLists.txt
 ./tools/perform/CMakeLists.txt
 ./tools/perform/CMakeTests.cmake
 
diff --git a/test/vds.c b/test/vds.c
index b64e09b..5173083 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -8279,7 +8279,7 @@ main(void)
     if(nerrors)
         goto error;
     printf("All virtual dataset tests passed.\n");
-    h5_cleanup(FILENAME, fapl);
+//    h5_cleanup(FILENAME, fapl);
 
     return 0;
 
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 7658c04..aa18bed 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -31,7 +31,7 @@ if (BUILD_TESTING)
     TARGET_C_PROPERTIES (h5dumpgentest STATIC " " " ")
     target_link_libraries (h5dumpgentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
     set_target_properties (h5dumpgentest PROPERTIES FOLDER generator/tools)
-    
+
     #add_test (NAME h5dumpgentest COMMAND $<TARGET_FILE:h5dumpgentest>)
   endif (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
 
@@ -39,6 +39,8 @@ if (BUILD_TESTING)
 
   include (CMakeTestsPBITS.cmake)
 
+  include (CMakeTestsVDS.cmake)
+
   include (CMakeTestsXML.cmake)
 endif (BUILD_TESTING)
 
diff --git a/tools/h5dump/CMakeTestsPBITS.cmake b/tools/h5dump/CMakeTestsPBITS.cmake
index 421e020..e76fa0e 100644
--- a/tools/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/h5dump/CMakeTestsPBITS.cmake
@@ -4,65 +4,65 @@
 ###           T E S T I N G                                                ###
 ##############################################################################
 ##############################################################################
-  
+
   # --------------------------------------------------------------------
   # Packed Bits
   # --------------------------------------------------------------------
   #-- Copy all the HDF5 files from the test directory into the source directory
   set (HDF5_REFERENCE_PBITS
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tnofilename-with-packed-bits.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsArray.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsCompound.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsIncomplete.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsLengthExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsCharLengthExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsIntLengthExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsLongLengthExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsLengthPositive.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsMax.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsMaxExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsOffsetExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsCharOffsetExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsIntOffsetExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsLongOffsetExceeded.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsOffsetNegative.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsOverlapped.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSigned.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsigned.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedInt.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedInt.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLong.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLong.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLong.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLong.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedIntWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedIntWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLongWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLongWhole.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLongWhole1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLongWhole1.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLongWhole63.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLongWhole63.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSigned4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsigned4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedInt8.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedInt8.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLong16.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLong16.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLong32.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLong32.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSigned2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsigned2.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedInt4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedInt4.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLong8.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLong8.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsSignedLongLong16.ddl
-      ${HDF5_TOOLS_SRC_DIR}/testfiles/tpbitsUnsignedLongLong16.ddl
+      tnofilename-with-packed-bits.ddl
+      tpbitsArray.ddl
+      tpbitsCompound.ddl
+      tpbitsIncomplete.ddl
+      tpbitsLengthExceeded.ddl
+      tpbitsCharLengthExceeded.ddl
+      tpbitsIntLengthExceeded.ddl
+      tpbitsLongLengthExceeded.ddl
+      tpbitsLengthPositive.ddl
+      tpbitsMax.ddl
+      tpbitsMaxExceeded.ddl
+      tpbitsOffsetExceeded.ddl
+      tpbitsCharOffsetExceeded.ddl
+      tpbitsIntOffsetExceeded.ddl
+      tpbitsLongOffsetExceeded.ddl
+      tpbitsOffsetNegative.ddl
+      tpbitsOverlapped.ddl
+      tpbitsSigned.ddl
+      tpbitsUnsigned.ddl
+      tpbitsSignedInt.ddl
+      tpbitsUnsignedInt.ddl
+      tpbitsSignedLong.ddl
+      tpbitsUnsignedLong.ddl
+      tpbitsSignedLongLong.ddl
+      tpbitsUnsignedLongLong.ddl
+      tpbitsSignedWhole.ddl
+      tpbitsUnsignedWhole.ddl
+      tpbitsSignedIntWhole.ddl
+      tpbitsUnsignedIntWhole.ddl
+      tpbitsSignedLongWhole.ddl
+      tpbitsUnsignedLongWhole.ddl
+      tpbitsSignedLongLongWhole.ddl
+      tpbitsUnsignedLongLongWhole.ddl
+      tpbitsSignedLongLongWhole1.ddl
+      tpbitsUnsignedLongLongWhole1.ddl
+      tpbitsSignedLongLongWhole63.ddl
+      tpbitsUnsignedLongLongWhole63.ddl
+      tpbitsSigned4.ddl
+      tpbitsUnsigned4.ddl
+      tpbitsSignedInt8.ddl
+      tpbitsUnsignedInt8.ddl
+      tpbitsSignedLong16.ddl
+      tpbitsUnsignedLong16.ddl
+      tpbitsSignedLongLong32.ddl
+      tpbitsUnsignedLongLong32.ddl
+      tpbitsSigned2.ddl
+      tpbitsUnsigned2.ddl
+      tpbitsSignedInt4.ddl
+      tpbitsUnsignedInt4.ddl
+      tpbitsSignedLong8.ddl
+      tpbitsUnsignedLong8.ddl
+      tpbitsSignedLongLong16.ddl
+      tpbitsUnsignedLongLong16.ddl
   )
   set (HDF5_REFERENCE_TEST_PBITS
       ${HDF5_TOOLS_SRC_DIR}/testfiles/packedbits.h5
@@ -70,19 +70,19 @@
       ${HDF5_TOOLS_SRC_DIR}/testfiles/tcompound.h5
   )
   set (HDF5_ERROR_REFERENCE_PBITS
-      ${PROJECT_SOURCE_DIR}/errfiles/tnofilename-with-packed-bits.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsCharLengthExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsCharOffsetExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsIncomplete.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsIntLengthExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsIntOffsetExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsLengthExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsLengthPositive.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsLongLengthExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsLongOffsetExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsMaxExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsOffsetExceeded.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tpbitsOffsetNegative.err
+      tnofilename-with-packed-bits.err
+      tpbitsCharLengthExceeded.err
+      tpbitsCharOffsetExceeded.err
+      tpbitsIncomplete.err
+      tpbitsIntLengthExceeded.err
+      tpbitsIntOffsetExceeded.err
+      tpbitsLengthExceeded.err
+      tpbitsLengthPositive.err
+      tpbitsLongLengthExceeded.err
+      tpbitsLongOffsetExceeded.err
+      tpbitsMaxExceeded.err
+      tpbitsOffsetExceeded.err
+      tpbitsOffsetNegative.err
   )
 
   foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS})
@@ -96,7 +96,7 @@
         ARGS       -E copy_if_different ${pbits_h5_file} ${dest}
     )
   endforeach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS})
-  
+
 
   foreach (ddl_pbits ${HDF5_REFERENCE_PBITS})
     GET_FILENAME_COMPONENT(fname "${ddl_pbits}" NAME)
@@ -106,7 +106,7 @@
         TARGET     h5dump
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different ${ddl_pbits} ${ddldest}
+        ARGS       -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/pbits/${ddl_pbits} ${ddldest}
     )
   endforeach (ddl_pbits ${HDF5_REFERENCE_PBITS})
 
@@ -118,10 +118,10 @@
         TARGET     h5dump
         POST_BUILD
         COMMAND    ${CMAKE_COMMAND}
-        ARGS       -E copy_if_different ${ddl_pbits} ${ddldest}
+        ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/errfiles/${ddl_pbits} ${ddldest}
     )
   endforeach (ddl_pbits ${HDF5_ERROR_REFERENCE_PBITS})
-  
+
 ##############################################################################
 ##############################################################################
 ###           T H E   T E S T S  M A C R O S                               ###
@@ -163,7 +163,7 @@
 
 ##############################################################################
 ##############################################################################
-###           T H E   T E S T S                                          HDF5_ENABLE_USING_MEMCHECKER  ###
+###           T H E   T E S T S                                            ###
 ##############################################################################
 ##############################################################################
 
@@ -172,7 +172,7 @@
     add_test (
       NAME H5DUMP_PACKED_BITS-clearall-objects
       COMMAND    ${CMAKE_COMMAND}
-          -E remove 
+          -E remove
           tnofilename-with-packed-bits.out
           tnofilename-with-packed-bits.out.err
           tpbitsArray.out
diff --git a/tools/h5dump/CMakeTestsVDS.cmake b/tools/h5dump/CMakeTestsVDS.cmake
new file mode 100644
index 0000000..17d923e
--- /dev/null
+++ b/tools/h5dump/CMakeTestsVDS.cmake
@@ -0,0 +1,221 @@
+
+##############################################################################
+##############################################################################
+###           T E S T I N G                                                ###
+##############################################################################
+##############################################################################
+
+  # --------------------------------------------------------------------
+  # VDS
+  # --------------------------------------------------------------------
+  #-- Copy all the HDF5 files from the test directory into the source directory
+  set (HDF5_REFERENCE_VDS
+      tvds-1.ddl
+      tvds-2.ddl
+      tvds-3_1.ddl
+      tvds-3_2.ddl
+      tvds-4.ddl
+      tvds-5.ddl
+      tvds_layout-1.ddl
+      tvds_layout-2.ddl
+      tvds_layout-3_1.ddl
+      tvds_layout-3_2.ddl
+      tvds_layout-4.ddl
+      tvds_layout-5.ddl
+  )
+  set (HDF5_REFERENCE_TEST_VDS
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (HDF5_ERROR_REFERENCE_VDS
+  )
+
+  foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS})
+    GET_FILENAME_COMPONENT(fname "${vds_h5_file}" NAME)
+    set (dest "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}")
+    #message (STATUS " Copying ${vds_h5_file}")
+    add_custom_command (
+        TARGET     h5dump
+        POST_BUILD
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/${vds_h5_file} ${dest}
+    )
+  endforeach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS})
+
+
+  foreach (ddl_vds ${HDF5_REFERENCE_VDS})
+    GET_FILENAME_COMPONENT(fname "${ddl_vds}" NAME)
+    set (ddldest "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}")
+    #message (STATUS " Copying ${ddl_vds}")
+    add_custom_command (
+        TARGET     h5dump
+        POST_BUILD
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${HDF5_TOOLS_SRC_DIR}/testfiles/vds/${ddl_vds} ${ddldest}
+    )
+  endforeach (ddl_vds ${HDF5_REFERENCE_VDS})
+
+  foreach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS})
+    GET_FILENAME_COMPONENT(fname "${ddl_vds}" NAME)
+    set (ddldest "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}")
+    #message (STATUS " Copying ${ddl_vds}")
+    add_custom_command (
+        TARGET     h5dump
+        POST_BUILD
+        COMMAND    ${CMAKE_COMMAND}
+        ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds} ${ddldest}
+    )
+  endforeach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS})
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S  M A C R O S                               ###
+##############################################################################
+##############################################################################
+
+  MACRO (ADD_H5_VDS_TEST resultfile resultcode)
+    # If using memchecker add tests without using scripts
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> ${ARGN})
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfilesvds")
+      if (NOT ${resultcode} STREQUAL "0")
+        set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
+      endif (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${last_vds_test}" STREQUAL "")
+        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
+      endif (NOT "${last_vds_test}" STREQUAL "")
+    else (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove ${resultfile}.out ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
+      add_test (
+          NAME H5DUMP-${resultfile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds"
+              -D "TEST_OUTPUT=${resultfile}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}.ddl"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
+    endif (HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_VDS_TEST file)
+
+  MACRO (ADD_H5_VDS_LAYOUT resultfile resultcode)
+    # If using memchecker add tests without using scripts
+    if (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (NAME H5DUMP-${resultfile} COMMAND $<TARGET_FILE:h5dump> -p ${ARGN})
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfilesvds")
+      if (NOT ${resultcode} STREQUAL "0")
+        set_tests_properties (H5DUMP-${resultfile} PROPERTIES WILL_FAIL "true")
+      endif (NOT ${resultcode} STREQUAL "0")
+      if (NOT "${last_vds_test}" STREQUAL "")
+        set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS ${last_VDS_test})
+      endif (NOT "${last_vds_test}" STREQUAL "")
+    else (HDF5_ENABLE_USING_MEMCHECKER)
+      add_test (
+          NAME H5DUMP-${resultfile}-clear-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove ${resultfile}.out ${resultfile}.out.err
+      )
+      set_tests_properties (H5DUMP-${resultfile}-clear-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
+      add_test (
+          NAME H5DUMP-${resultfile}
+          COMMAND "${CMAKE_COMMAND}"
+              -D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
+              -D "TEST_ARGS:STRING=-p;${ARGN}"
+              -D "TEST_FOLDER=${PROJECT_BINARY_DIR}/testfiles/vds"
+              -D "TEST_OUTPUT=${resultfile}.out"
+              -D "TEST_EXPECT=${resultcode}"
+              -D "TEST_REFERENCE=${resultfile}.ddl"
+              -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
+      )
+      set_tests_properties (H5DUMP-${resultfile} PROPERTIES DEPENDS "H5DUMP-${resultfile}-clear-objects")
+    endif (HDF5_ENABLE_USING_MEMCHECKER)
+  ENDMACRO (ADD_H5_VDS_LAYOUT file)
+
+##############################################################################
+##############################################################################
+###           T H E   T E S T S                                            ###
+##############################################################################
+##############################################################################
+
+  if (HDF5_ENABLE_USING_MEMCHECKER)
+    # Remove any output file left over from previous test run
+    add_test (
+      NAME H5DUMP_VDS-clearall-objects
+      COMMAND    ${CMAKE_COMMAND}
+          -E remove
+          tvds-1.out
+          tvds-1.out.err
+          tvds-2.out
+          tvds-2.out.err
+          tvds-3_1.out
+          tvds-3_1.out.err
+          tvds-3_2.out
+          tvds-3_2.out.err
+          tvds-4.out
+          tvds-4.out.err
+          tvds-5.out
+          tvds-5.out.err
+          tvds_layout-1.out
+          tvds_layout-1.out.err
+          tvds_layout-2.out
+          tvds_layout-2.out.err
+          tvds_layout-3_1.out
+          tvds_layout-3_1.out.err
+          tvds_layout-3_2.out
+          tvds_layout-3_2.out.err
+          tvds_layout-4.out
+          tvds_layout-4.out.err
+          tvds_layout-5.out
+          tvds_layout-5.out.err
+    )
+    set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
+    if (NOT "${last_vds_test}" STREQUAL "")
+      set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES DEPENDS ${last_vds_test})
+    endif (NOT "${last_vds_test}" STREQUAL "")
+    set (last_VDS_test "H5DUMP_VDS-clearall-objects")
+  endif (HDF5_ENABLE_USING_MEMCHECKER)
+
+  # Data read
+  ADD_H5_VDS_TEST (tvds-1 0 --enable-error-stack 1_vds.h5)
+  ADD_H5_VDS_TEST (tvds-2 0 --enable-error-stack 2_vds.h5)
+  ADD_H5_VDS_TEST (tvds-3_1 0 --enable-error-stack 3_1_vds.h5)
+  ADD_H5_VDS_TEST (tvds-3_2 0 --enable-error-stack 3_2_vds.h5)
+  ADD_H5_VDS_TEST (tvds-4 0 --enable-error-stack 4_vds.h5)
+  ADD_H5_VDS_TEST (tvds-5 0 --enable-error-stack 5_vds.h5)
+
+  # Layout read
+  ADD_H5_VDS_LAYOUT (tvds_layout-1 0 --enable-error-stack 1_vds.h5)
+  ADD_H5_VDS_LAYOUT (tvds_layout-2 0 --enable-error-stack 2_vds.h5)
+  ADD_H5_VDS_LAYOUT (tvds_layout-3_1 0 --enable-error-stack 3_1_vds.h5)
+  ADD_H5_VDS_LAYOUT (tvds_layout-3_2 0 --enable-error-stack 3_2_vds.h5)
+  ADD_H5_VDS_LAYOUT (tvds_layout-4 0 --enable-error-stack 4_vds.h5)
+  ADD_H5_VDS_LAYOUT (tvds_layout-5 0 --enable-error-stack 5_vds.h5)
diff --git a/tools/h5dump/testh5dumppbits.sh.in b/tools/h5dump/testh5dumppbits.sh.in
index 6556ff5..4211c63 100644
--- a/tools/h5dump/testh5dumppbits.sh.in
+++ b/tools/h5dump/testh5dumppbits.sh.in
@@ -28,10 +28,10 @@ EXIT_FAILURE=1
 DUMPER=h5dump                     # The tool name
 DUMPER_BIN=`pwd`/$DUMPER          # The path of the tool binary
 
-H5DIFF=../h5diff/h5diff           # The h5diff tool name 
+H5DIFF=../h5diff/h5diff           # The h5diff tool name
 H5DIFF_BIN=`pwd`/$H5DIFF          # The path of the h5diff  tool binary
 
-H5IMPORT=../h5import/h5import     # The h5import tool name 
+H5IMPORT=../h5import/h5import     # The h5import tool name
 H5IMPORT_BIN=`pwd`/$H5IMPORT      # The path of the h5import  tool binary
 
 RM='rm -rf'
@@ -81,59 +81,59 @@ $SRC_H5DUMP_TESTFILES/tcompound.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/tnofilename-with-packed-bits.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsArray.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsCompound.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsIncomplete.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsCharLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsIntLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsLongLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsLengthPositive.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsMax.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsMaxExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsCharOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsIntOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsLongOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsOffsetNegative.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsOverlapped.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSigned.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsigned.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedInt.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedInt.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLong.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLong.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSigned4.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsigned4.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSigned2.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsigned2.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsSignedLongLong16.ddl
-$SRC_H5DUMP_TESTFILES/tpbitsUnsignedLongLong16.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tnofilename-with-packed-bits.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsArray.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsCompound.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsIncomplete.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharLengthExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntLengthExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongLengthExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthPositive.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsMax.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsMaxExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharOffsetExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntOffsetExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongOffsetExceeded.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetNegative.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsOverlapped.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedIntWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedIntWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole1.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole63.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned4.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned4.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt8.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt8.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong16.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong16.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong32.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong32.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned2.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned2.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt4.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt4.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong8.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong8.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong16.ddl
+$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong16.ddl
 "
 
 LIST_ERROR_TEST_FILES="
@@ -173,10 +173,10 @@ COPY_TESTFILES_TO_TESTDIR()
             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
+              $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
@@ -303,7 +303,7 @@ TOOLTEST2() {
      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 $actualdata $actual_err
@@ -434,7 +434,7 @@ SKIP() {
    TESTING $DUMPER $@
     echo  " -SKIP-"
 }
-  
+
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
@@ -445,7 +445,7 @@ PRINT_H5DIFF() {
 
 # Call the h5diff tool
 #
-DIFFTEST() 
+DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
@@ -459,7 +459,7 @@ DIFFTEST()
     else
          echo " PASSED"
     fi
-        
+
 }
 
 # Print a line-line message left justified in a field of 70 characters
@@ -472,7 +472,7 @@ PRINT_H5IMPORT() {
 
 # Call the h5import tool
 #
-IMPORTTEST() 
+IMPORTTEST()
 {
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
@@ -483,7 +483,7 @@ IMPORTTEST()
     PRINT_H5IMPORT  $@
     (
   cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@" 
+  $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
     if [ $RET != 0 ] ; then
@@ -492,7 +492,7 @@ IMPORTTEST()
     else
          echo " PASSED"
     fi
-        
+
 }
 
 
diff --git a/tools/h5dump/testh5dumpvds.sh.in b/tools/h5dump/testh5dumpvds.sh.in
new file mode 100644
index 0000000..7a2032e
--- /dev/null
+++ b/tools/h5dump/testh5dumpvds.sh.in
@@ -0,0 +1,501 @@
+#! /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 h5dump tool with vds type files
+
+srcdir=@srcdir@
+
+# Determine which filters are available
+USE_FILTER_SZIP="@USE_FILTER_SZIP@"
+USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
+
+TESTNAME=h5dump
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+DUMPER=h5dump                     # The tool name
+DUMPER_BIN=`pwd`/$DUMPER          # The path of the tool binary
+
+H5DIFF=../h5diff/h5diff           # The h5diff tool name
+H5DIFF_BIN=`pwd`/$H5DIFF          # The path of the h5diff  tool binary
+
+H5IMPORT=../h5import/h5import     # The h5import tool name
+H5IMPORT_BIN=`pwd`/$H5IMPORT      # The path of the h5import  tool binary
+
+RM='rm -rf'
+CMP='cmp -s'
+DIFF='diff -c'
+CP='cp'
+DIRNAME='dirname'
+LS='ls'
+AWK='awk'
+
+nerrors=0
+verbose=yes
+
+# source dirs
+SRC_TOOLS="$srcdir/../"
+
+SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+# testfiles source dirs for tools
+SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
+SRC_H5DIFF_TESTFILES="$SRC_TOOLS/h5diff/testfiles"
+SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles"
+SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"
+SRC_H5JAM_TESTFILES="$SRC_TOOLS/h5jam/testfiles"
+SRC_H5STAT_TESTFILES="$SRC_TOOLS/h5stat/testfiles"
+SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/h5import/testfiles"
+
+TEST_P_DIR=./testfiles
+TESTDIR=./testfiles/vds
+test -d $TEST_P_DIR || mkdir -p $TEST_P_DIR
+test -d $TESTDIR || mkdir -p $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_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
+"
+
+LIST_OTHER_TEST_FILES="
+$SRC_H5DUMP_TESTFILES/vds/tvds-1.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds-2.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds-3_1.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds-3_2.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds-4.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds-5.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-1.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-2.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl
+$SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl
+"
+
+LIST_ERROR_TEST_FILES="
+"
+
+#
+# copy test files and expected output files from source dirs to test dir
+#
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_ERROR_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=`$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
+        $RM $TESTDIR
+    fi
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Testing".
+#
+TESTING() {
+   SPACES="                                                               "
+   echo "Testing $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Source in the output filter function definitions.
+. $srcdir/../../bin/output_filter.sh
+
+# Run a test and print PASS or *FAIL*.  If a test fails then increment
+# the `nerrors' global variable and (if $verbose is set) display the
+# difference between the actual output and the expected output. The
+# expected output is given as the first argument to this function and
+# the actual output file is calculated by replacing the `.ddl' with
+# `.out'.  The actual output is not removed if $HDF5_NOCLEANUP has a
+# non-zero value.
+#
+TOOLTEST() {
+    expect="$TESTDIR/$1"
+    actual="$TESTDIR/`basename $1 .ddl`.out"
+    actual_err="$TESTDIR/`basename $1 .ddl`.err"
+    actual_sav=${actual}-sav
+    actual_err_sav=${actual_err}-sav
+    shift
+
+    # Run test.
+    TESTING $DUMPER $@
+    (
+    cd $TESTDIR
+      $RUNSERIAL $DUMPER_BIN "$@"
+    ) >$actual 2>$actual_err
+
+    # save actual and actual_err in case they are needed later.
+    cp $actual $actual_sav
+    STDOUT_FILTER $actual
+    cp $actual_err $actual_err_sav
+    STDERR_FILTER $actual_err
+    cat $actual_err >> $actual
+
+  if [ ! -f $expect ]; then
+    # Create the expect file if it doesn't yet exist.
+     echo " CREATED"
+     cp $actual $expect
+    elif $CMP $expect $actual; then
+     echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+   nerrors="`expr $nerrors + 1`"
+   test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+   rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+    fi
+
+}
+
+
+# same as TOOLTEST1 but compares generated file to expected output
+#                   and compares the generated data file to the expected data file
+# used for the binary tests that expect a full path in -o without -b
+TOOLTEST2() {
+
+    expectdata="$TESTDIR/$1"
+    expect="$TESTDIR/`basename $1 .exp`.ddl"
+    actualdata="$TESTDIR/`basename $1 .exp`.txt"
+    actual="$TESTDIR/`basename $1 .exp`.out"
+    actual_err="$TESTDIR/`basename $1 .exp`.err"
+    shift
+
+    # Run test.
+    TESTING $DUMPER $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $DUMPER_BIN "$@"
+    ) >$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; then
+      if [ ! -f $expectdata ]; then
+      # Create the expect data file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actualdata $expectdata
+      elif $CMP $expectdata $actualdata; then
+        echo " PASSED"
+      else
+        echo "*FAILED*"
+        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+      fi
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+     rm -f $actual $actualdata $actual_err
+    fi
+
+}
+
+# same as TOOLTEST but filters error stack outp
+# Extract file name, line number, version and thread IDs because they may be different
+TOOLTEST3() {
+
+    expect="$TESTDIR/$1"
+    actual="$TESTDIR/`basename $1 .ddl`.out"
+    actual_err="$TESTDIR/`basename $1 .ddl`.err"
+    actual_ext="$TESTDIR/`basename $1 .ddl`.ext"
+    actual_sav=${actual}-sav
+    actual_err_sav=${actual_err}-sav
+    shift
+
+    # Run test.
+    TESTING $DUMPER $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $DUMPER_BIN "$@"
+    ) >$actual 2>$actual_err
+
+    # save actual and actual_err in case they are needed later.
+    cp $actual $actual_sav
+    STDOUT_FILTER $actual
+    cp $actual_err $actual_err_sav
+    STDERR_FILTER $actual_err
+
+    # 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_ext
+    cat $actual_ext >> $actual
+
+    if [ ! -f $expect ]; then
+    # Create the expect file if it doesn't yet exist.
+     echo " CREATED"
+     cp $actual $expect
+    elif $CMP $expect $actual; then
+     echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+   rm -f $actual $actual_err $actual_sav $actual_err_sav
+    fi
+
+}
+
+# same as TOOLTEST3 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
+TOOLTEST4() {
+
+    expect="$TESTDIR/$1"
+    expect_err="$TESTDIR/`basename $1 .ddl`.err"
+    actual="$TESTDIR/`basename $1 .ddl`.out"
+    actual_err="$TESTDIR/`basename $1 .ddl`.oerr"
+    actual_ext="$TESTDIR/`basename $1 .ddl`.ext"
+    actual_sav=${actual}-sav
+    actual_err_sav=${actual_err}-sav
+    shift
+
+    # Run test.
+    TESTING $DUMPER $@
+    (
+      cd $TESTDIR
+      $RUNSERIAL $DUMPER_BIN "$@"
+    ) >$actual 2>$actual_err
+
+    # save actual and actual_err in case they are needed later.
+    cp $actual $actual_sav
+    STDOUT_FILTER $actual
+    cp $actual_err $actual_err_sav
+    STDERR_FILTER $actual_err
+
+    # 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_ext
+    #cat $actual_ext >> $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
+     if $CMP $expect_err $actual_ext; then
+      echo " PASSED"
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.err) differs from actual result (*.oerr)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+    fi
+    else
+     echo "*FAILED*"
+     echo "    Expected result (*.ddl) differs from actual result (*.out)"
+     nerrors="`expr $nerrors + 1`"
+     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+   rm -f $actual $actual_err $actual_sav $actual_err_sav
+    fi
+
+}
+
+# Print a "SKIP" message
+SKIP() {
+   TESTING $DUMPER $@
+    echo  " -SKIP-"
+}
+
+# Print a line-line message left justified in a field of 70 characters
+#
+PRINT_H5DIFF() {
+ SPACES="                                                               "
+ echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+
+# Call the h5diff tool
+#
+DIFFTEST()
+{
+    PRINT_H5DIFF  $@
+    (
+  cd $TESTDIR
+  $RUNSERIAL $H5DIFF_BIN "$@" -q
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+         echo "*FAILED*"
+         nerrors="`expr $nerrors + 1`"
+    else
+         echo " PASSED"
+    fi
+
+}
+
+# Print a line-line message left justified in a field of 70 characters
+# beginning with the word "Verifying".
+#
+PRINT_H5IMPORT() {
+ SPACES="                                                               "
+ echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+}
+
+# Call the h5import tool
+#
+IMPORTTEST()
+{
+    # remove the output hdf5 file if it exists
+    hdf5_file="$TESTDIR/$5"
+    if [ -f $hdf5_file ]; then
+     rm -f $hdf5_file
+    fi
+
+    PRINT_H5IMPORT  $@
+    (
+  cd $TESTDIR
+  $RUNSERIAL $H5IMPORT_BIN "$@"
+    )
+    RET=$?
+    if [ $RET != 0 ] ; then
+         echo "*FAILED*"
+         nerrors="`expr $nerrors + 1`"
+    else
+         echo " PASSED"
+    fi
+
+}
+
+
+##############################################################################
+##############################################################################
+###        T H E   T E S T S                                            ###
+##############################################################################
+##############################################################################
+# prepare for test
+COPY_TESTFILES_TO_TESTDIR
+
+####### test for dataset vds ######
+
+  # Data read
+TOOLTEST tvds-1.ddl --enable-error-stack 1_vds.h5
+TOOLTEST tvds-2.ddl --enable-error-stack 2_vds.h5
+TOOLTEST tvds-3_1.ddl --enable-error-stack 3_1_vds.h5
+TOOLTEST tvds-3_2.ddl --enable-error-stack 3_2_vds.h5
+TOOLTEST tvds-4.ddl --enable-error-stack 4_vds.h5
+TOOLTEST tvds-5.ddl --enable-error-stack 5_vds.h5
+
+  # Layout read
+TOOLTEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5
+TOOLTEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5
+TOOLTEST tvds_layout-3_1.ddl -p --enable-error-stack 3_1_vds.h5
+TOOLTEST tvds_layout-3_2.ddl -p --enable-error-stack 3_2_vds.h5
+TOOLTEST tvds_layout-4.ddl -p --enable-error-stack 4_vds.h5
+TOOLTEST tvds_layout-5.ddl -p --enable-error-stack 5_vds.h5
+
+# Clean up temporary files/directories
+CLEAN_TESTFILES_AND_TESTDIR
+
+# Report test results and exit
+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/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 96be6a2..3a06d3a 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -385,7 +385,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
                 }
 
                 ctx->need_prefix = TRUE;
-                
+
                 if(FALSE == dimension_break)
                     elmt_counter = 0;
             } /* end for (i = 0; i < nelmts... */
@@ -827,7 +827,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id,
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "Could not allocate buffer for dims");
 
     dims1[0] = npoints;
-    
+
     /* Create dataspace for reading buffer */
     if((mem_space = H5Screate_simple(1, dims1, NULL)) < 0)
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Screate_simple failed");
@@ -1474,7 +1474,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co
 
     if((f_space = H5Dget_space(dset)) < 0)
         H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Dget_space failed");
-    
+
     if((sndims = H5Sget_simple_extent_ndims(f_space)) < 0)
         H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sget_simple_extent_ndims failed");
     ctx->ndims = (unsigned)sndims;
@@ -1539,6 +1539,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
     /* Hyperslab info */
     hsize_t             hs_offset[H5S_MAX_RANK];  /* starting offset */
     hsize_t             hs_size[H5S_MAX_RANK];    /* size this pass */
+    //hsize_t             hs_count[H5S_MAX_RANK];    /* size this pass */
     hsize_t             hs_nelmts;                /* elements in request */
 
     /* VL data special information */
@@ -1621,9 +1622,11 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
                 hs_size[i] = MIN(total_size[i] - hs_offset[i], sm_size[i]);
                 ctx->p_max_idx[i] = ctx->p_min_idx[i] + hs_size[i];
                 hs_nelmts *= hs_size[i];
+//                hs_count[i] = 1;
             }
 
             H5Sselect_hyperslab(f_space, H5S_SELECT_SET, hs_offset, NULL, hs_size, NULL);
+//            H5Sselect_hyperslab(f_space, H5S_SELECT_SET, hs_offset, NULL, hs_count, hs_size);
             H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL);
         }
         else {
@@ -1760,7 +1763,7 @@ CATCH
  *-------------------------------------------------------------------------
  */
 int
-h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, 
+h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
         hid_t dset, struct subset_t *sset)
 {
     hid_t     f_space = -1;
@@ -1836,7 +1839,7 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx, 
+h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
                 hid_t obj_id, hid_t type, hid_t space, void *mem)
 {
     HERR_INIT(int, SUCCEED)
@@ -1915,18 +1918,18 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             }
             else
                 h5tools_str_append(buffer, "\"%s\"", obj->objname);
-        } 
+        }
         else {
             error_msg("unknown committed type.\n");
             h5tools_setstatus(EXIT_FAILURE);
         }
 
         return ret_value;
-    } 
-    
+    }
+
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
-    
+
     switch (type_class) {
     case H5T_INTEGER:
         if (H5Tequal(type, H5T_STD_I8BE) == TRUE) {
@@ -2248,7 +2251,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
                 HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tset_order failed");
         } /* end if */
         else if(order == H5T_ORDER_BE) {
-            if(H5Tset_order(str_type, H5T_ORDER_BE) < 0) 
+            if(H5Tset_order(str_type, H5T_ORDER_BE) < 0)
                 HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tset_order failed");
         } /* end if */
 
@@ -2279,7 +2282,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
                 HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tset_order failed");
         } /* end if */
         else if(order == H5T_ORDER_BE) {
-            if(H5Tset_order(str_type, H5T_ORDER_BE) < 0) 
+            if(H5Tset_order(str_type, H5T_ORDER_BE) < 0)
                 HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tset_order failed");
         } /* end if */
 
@@ -2353,9 +2356,9 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
            h5tools_str_reset(buffer);
            h5tools_str_append(buffer, "OPAQUE_TAG \"%s\";", ttag);
            h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-           
+
            H5free_memory(ttag);
-        } 
+        }
         ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
@@ -2369,7 +2372,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
         if((snmembers = H5Tget_nmembers(type)) < 0)
             H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_nmembers failed");
         nmembers = (unsigned)snmembers;
-        
+
         h5tools_str_append(buffer, "H5T_COMPOUND %s", h5tools_dump_header_format->structblockbegin);
         h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
@@ -2424,7 +2427,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
 
         h5tools_str_reset(buffer);
         h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE);
-        
+
         if(H5Tclose(super) < 0)
             HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Tclose failed");
 
@@ -2612,7 +2615,7 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i
 
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
-    
+
     if((snmembs = H5Tget_nmembers(type)) < 0)
         H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Tget_nmembers failed");
     nmembs = (unsigned)snmembs;
@@ -2752,7 +2755,7 @@ h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info,
         ncols = info->line_ncols;
 
     ctx->need_prefix = TRUE;
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ",
                         h5tools_dump_header_format->datatypebegin,
@@ -2774,7 +2777,7 @@ h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info,
 /*-------------------------------------------------------------------------
  * Function:    dump_dataspace
  *
- * Purpose:     Dump the dataspace. 
+ * Purpose:     Dump the dataspace.
  *
  * Return:      void
  *
@@ -2800,7 +2803,7 @@ h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
         ncols = info->line_ncols;
 
     ctx->need_prefix = TRUE;
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s ",
                         h5tools_dump_header_format->dataspacebegin);
@@ -2850,7 +2853,7 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s %d %s", OBJID, BEGIN, oid, END);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3014,7 +3017,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     */
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", STORAGE_LAYOUT, BEGIN);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3302,7 +3305,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3314,13 +3317,13 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
             cd_nelmts = NELMTS(cd_values);
             filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
                 cd_values, sizeof(f_name), f_name, NULL);
-				
-			if (filtn < 0)
-			    continue; /* nothing to print for invalid filter */
+
+      if (filtn < 0)
+          continue; /* nothing to print for invalid filter */
 
             ctx->need_prefix = TRUE;
             h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-            
+
             h5tools_str_reset(&buffer);
             switch(filtn) {
                 case H5Z_FILTER_DEFLATE:
@@ -3384,7 +3387,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) {
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-                        
+
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "HEADER %s", "RAW");
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3409,11 +3412,11 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     break;
                 default:
                     /* filters do not have to be available for showing registered filter info.
-					   see HDFFV-8346 for details. --xcao@hdfgroup.org
+             see HDFFV-8346 for details. --xcao@hdfgroup.org
                     if(H5Zfilter_avail(filtn))
                         h5tools_str_append(&buffer, "%s %s", "USER_REGISTERED_FILTER", BEGIN);
                     else
-					*/
+          */
                     h5tools_str_append(&buffer, "%s %s", "USER_DEFINED_FILTER", BEGIN);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
@@ -3421,15 +3424,15 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
                     ctx->need_prefix = TRUE;
                     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-                    
+
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "FILTER_ID %d", filtn);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    
+
                     if(f_name[0] != '\0') {
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-                        
+
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "COMMENT %s", f_name);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3437,7 +3440,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
                     if (cd_nelmts) {
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-                        
+
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s %s ","PARAMS", BEGIN);
                         for (j=0; j<cd_nelmts; j++)
@@ -3449,7 +3452,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
                     ctx->need_prefix = TRUE;
                     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-                    
+
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s",END);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3461,7 +3464,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
         ctx->need_prefix = TRUE;
         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-        
+
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "NONE");
         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3470,7 +3473,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s",END);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3481,7 +3484,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     */
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", FILLVALUE, BEGIN);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3490,10 +3493,10 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "FILL_TIME ");
-    
+
     H5Pget_fill_time(dcpl_id, &ft);
     switch(ft) {
         case H5D_FILL_TIME_ALLOC:
@@ -3513,7 +3516,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s ", "VALUE ");
     H5Pfill_value_defined(dcpl_id, &fvstatus);
@@ -3529,7 +3532,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-        
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3540,7 +3543,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     */
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3549,7 +3552,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     H5Pget_alloc_time(dcpl_id, &at);
     switch(at) {
@@ -3572,7 +3575,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3622,7 +3625,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
                 comment[cmt_bufsize] = '\0'; /* necessary because null char is not returned */
 
                 ctx->need_prefix = TRUE;
-                
+
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "COMMENT \"%s\"", comment);
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3637,7 +3640,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
 /*-------------------------------------------------------------------------
  * Function:    dump_attribute
  *
- * Purpose:     Dump the attribute. 
+ * Purpose:     Dump the attribute.
  *
  * Return:      void
  *
@@ -3646,7 +3649,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
  */
 void
 h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, const char *attr_name, hid_t attr_id, 
+        h5tools_context_t *ctx, const char *attr_name, hid_t attr_id,
         int display_index, int display_char)
 {
     h5tools_str_t buffer;          /* string into which to render   */
@@ -3665,7 +3668,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s \"%s\" %s",
             h5tools_dump_header_format->attributebegin, attr_name,
@@ -3674,7 +3677,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
 
     if(attr_id < 0) {
         error_msg("unable to open attribute \"%s\"\n", attr_name);
-    } 
+    }
     else {
         hid_t type, space;
 
@@ -3701,7 +3704,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
 
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
-    
+
     h5tools_str_reset(&buffer);
 
     if (HDstrlen(h5tools_dump_header_format->attributeblockend)) {
@@ -3757,36 +3760,36 @@ void
 h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type)
 {
     int     packed_bits_size = 0;
-    
+
     hid_t n_type = h5tools_get_native_type(type);
     if(H5Tget_class(n_type)==H5T_INTEGER) {
         if(H5Tequal(n_type, H5T_NATIVE_SCHAR) == TRUE) {
             packed_bits_size = 8 * sizeof(char);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_UCHAR) == TRUE) {
             packed_bits_size = 8 * sizeof(unsigned char);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_SHORT) == TRUE) {
             packed_bits_size = 8 * sizeof(short);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_USHORT) == TRUE) {
             packed_bits_size = 8 * sizeof(unsigned short);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_INT) == TRUE) {
             packed_bits_size = 8 * sizeof(int);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_UINT) == TRUE) {
             packed_bits_size = 8 * sizeof(unsigned int);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_LONG) == TRUE) {
             packed_bits_size = 8 * sizeof(long);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_ULONG) == TRUE) {
             packed_bits_size = 8 * sizeof(unsigned long);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_LLONG) == TRUE) {
             packed_bits_size = 8 * sizeof(long long);
-        } 
+        }
         else if(H5Tequal(n_type, H5T_NATIVE_ULLONG) == TRUE) {
             packed_bits_size = 8 * sizeof(unsigned long long);
         }
@@ -3827,25 +3830,25 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
-   
+
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->subsettingbegin, h5tools_dump_header_format->subsettingblockbegin);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
     ctx->indent_level++;
-    
+
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
-    
+
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->startbegin, h5tools_dump_header_format->startblockbegin);
     h5tools_print_dims(&buffer, sset->start.data, dims);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->startend, h5tools_dump_header_format->startblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-    
+
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
@@ -3854,7 +3857,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
     h5tools_print_dims(&buffer, sset->stride.data, dims);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->strideend, h5tools_dump_header_format->strideblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-    
+
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
@@ -3868,7 +3871,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
 
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->countend, h5tools_dump_header_format->countblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-    
+
     ctx->need_prefix = TRUE;
     h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
@@ -3882,7 +3885,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
 
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->blockend, h5tools_dump_header_format->blockblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-    
+
     ctx->indent_level--;
 
     h5tools_str_close(&buffer);
@@ -3899,7 +3902,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info,
  */
 void
 h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
-        h5tools_context_t *ctx, hid_t obj_id, int obj_data, struct subset_t *sset, 
+        h5tools_context_t *ctx, hid_t obj_id, int obj_data, struct subset_t *sset,
         int display_index, int display_char)
 {
     H5S_class_t space_type;
@@ -3962,10 +3965,10 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
 
         h5tools_dump_subsetting_header(stream, &outputformat, ctx, sset, H5Sget_simple_extent_ndims(f_space));
         H5Sclose(f_space);
-        
+
         ctx->indent_level++;
     }
-    
+
     ctx->need_prefix = TRUE;
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->databegin, h5tools_dump_header_format->datablockbegin);
@@ -3991,7 +3994,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
             datactx.indent_level++;
             datactx.need_prefix = TRUE;
             h5tools_simple_prefix(stream, info, &datactx, (hsize_t)0, 0);
-            
+
             string_dataformat = *info;
             string_dataformat.idx_fmt = "\"";
             string_dataformat.line_multi_new = 1;
@@ -4059,7 +4062,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
                         datactx.indent_level++;
                         datactx.need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, &datactx, (hsize_t)0, 0);
-                        
+
                         string_dataformat = *info;
                         string_dataformat.idx_fmt = "\"";
                         string_dataformat.line_multi_new = 1;
@@ -4086,7 +4089,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
                     H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
 
                 HDfree(buf);
-            } 
+            }
             else
                 status = SUCCEED;
 
@@ -4116,10 +4119,10 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
 
     if (sset && obj_data) {
         ctx->indent_level--;
-     
+
         ctx->need_prefix = TRUE;
         h5tools_simple_prefix(stream, &outputformat, ctx, (hsize_t)0, 0);
-        
+
         h5tools_str_reset(&buffer);
         if(HDstrlen(h5tools_dump_header_format->subsettingblockend)) {
             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->subsettingblockend);
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index e0f94d0..7c4caa4 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -52,6 +52,9 @@ if (BUILD_TESTING)
     target_link_libraries (h5repart_gentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
     set_target_properties (h5repart_gentest PROPERTIES FOLDER generator/tools)
     #add_test (NAME h5repart_gentest COMMAND $<TARGET_FILE:h5repart_gentest>)
+
+    add_subdirectory (${HDF5_TOOLS_MISC_SOURCE_DIR}/vds)
+
   endif (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
 
   add_executable (h5repart_test ${HDF5_TOOLS_MISC_SOURCE_DIR}/repart_test.c)
diff --git a/tools/misc/vds/CMakeLists.txt b/tools/misc/vds/CMakeLists.txt
new file mode 100644
index 0000000..dcf883c
--- /dev/null
+++ b/tools/misc/vds/CMakeLists.txt
@@ -0,0 +1,28 @@
+cmake_minimum_required (VERSION 3.1.0)
+PROJECT (HDF5_TOOLS_MISC_VDS)
+
+#-----------------------------------------------------------------------------
+# Setup include Directories
+#-----------------------------------------------------------------------------
+INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib)
+
+MACRO (ADD_H5_GENERATOR genfile)
+  add_executable (${genfile} ${HDF5_TOOLS_MISC_VDS_SOURCE_DIR}/${genfile}.c)
+  TARGET_NAMING (${genfile} STATIC)
+  TARGET_C_PROPERTIES (${genfile} STATIC " " " ")
+  target_link_libraries (${genfile} ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  set_target_properties (${genfile} PROPERTIES FOLDER generator/tools)
+ENDMACRO (ADD_H5_GENERATOR genfile)
+
+# generator executables
+set (H5_GENERATORS
+    UC_1_one_dim_gen
+    UC_2_two_dims_gen
+    UC_3_gaps_gen
+    UC_4_printf_gen
+    UC_5_stride_gen
+)
+
+foreach (gen ${H5_GENERATORS})
+  ADD_H5_GENERATOR (${gen})
+endforeach (gen ${H5_GENERATORS})
diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 64a2880..64a2880 100644
--- a/tools/testfiles/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
diff --git a/tools/testfiles/tpbitsArray.ddl b/tools/testfiles/pbits/tpbitsArray.ddl
index 125abb8..125abb8 100644
--- a/tools/testfiles/tpbitsArray.ddl
+++ b/tools/testfiles/pbits/tpbitsArray.ddl
diff --git a/tools/testfiles/tpbitsCharLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl
index b0683a7..b0683a7 100644
--- a/tools/testfiles/tpbitsCharLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl
diff --git a/tools/testfiles/tpbitsCharOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl
index 530fa05..530fa05 100644
--- a/tools/testfiles/tpbitsCharOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl
diff --git a/tools/testfiles/tpbitsCompound.ddl b/tools/testfiles/pbits/tpbitsCompound.ddl
index c84272a..c84272a 100644
--- a/tools/testfiles/tpbitsCompound.ddl
+++ b/tools/testfiles/pbits/tpbitsCompound.ddl
diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index cdb1f91..cdb1f91 100644
--- a/tools/testfiles/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
diff --git a/tools/testfiles/tpbitsIntLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl
index 1c919cd..1c919cd 100644
--- a/tools/testfiles/tpbitsIntLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl
diff --git a/tools/testfiles/tpbitsIntOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl
index f3b2a8c..f3b2a8c 100644
--- a/tools/testfiles/tpbitsIntOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl
diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 6d2492a..6d2492a 100644
--- a/tools/testfiles/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index 4f56619..4f56619 100644
--- a/tools/testfiles/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
diff --git a/tools/testfiles/tpbitsLongLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl
index 812c300..812c300 100644
--- a/tools/testfiles/tpbitsLongLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl
diff --git a/tools/testfiles/tpbitsLongOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl
index cbea722..cbea722 100644
--- a/tools/testfiles/tpbitsLongOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl
diff --git a/tools/testfiles/tpbitsMax.ddl b/tools/testfiles/pbits/tpbitsMax.ddl
index e569488..e569488 100644
--- a/tools/testfiles/tpbitsMax.ddl
+++ b/tools/testfiles/pbits/tpbitsMax.ddl
diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 3432433..3432433 100644
--- a/tools/testfiles/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index e51a09e..e51a09e 100644
--- a/tools/testfiles/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index ba6e46d..ba6e46d 100644
--- a/tools/testfiles/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
diff --git a/tools/testfiles/tpbitsOverlapped.ddl b/tools/testfiles/pbits/tpbitsOverlapped.ddl
index 9dcc9d2..9dcc9d2 100644
--- a/tools/testfiles/tpbitsOverlapped.ddl
+++ b/tools/testfiles/pbits/tpbitsOverlapped.ddl
diff --git a/tools/testfiles/tpbitsSigned.ddl b/tools/testfiles/pbits/tpbitsSigned.ddl
index b843388..b843388 100644
--- a/tools/testfiles/tpbitsSigned.ddl
+++ b/tools/testfiles/pbits/tpbitsSigned.ddl
diff --git a/tools/testfiles/tpbitsSigned2.ddl b/tools/testfiles/pbits/tpbitsSigned2.ddl
index 932b5fd..932b5fd 100644
--- a/tools/testfiles/tpbitsSigned2.ddl
+++ b/tools/testfiles/pbits/tpbitsSigned2.ddl
diff --git a/tools/testfiles/tpbitsSigned4.ddl b/tools/testfiles/pbits/tpbitsSigned4.ddl
index 9eacd83..9eacd83 100644
--- a/tools/testfiles/tpbitsSigned4.ddl
+++ b/tools/testfiles/pbits/tpbitsSigned4.ddl
diff --git a/tools/testfiles/tpbitsSignedInt.ddl b/tools/testfiles/pbits/tpbitsSignedInt.ddl
index 5c37e77..5c37e77 100644
--- a/tools/testfiles/tpbitsSignedInt.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedInt.ddl
diff --git a/tools/testfiles/tpbitsSignedInt4.ddl b/tools/testfiles/pbits/tpbitsSignedInt4.ddl
index 4e9f0f6..4e9f0f6 100644
--- a/tools/testfiles/tpbitsSignedInt4.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedInt4.ddl
diff --git a/tools/testfiles/tpbitsSignedInt8.ddl b/tools/testfiles/pbits/tpbitsSignedInt8.ddl
index f2d6069..f2d6069 100644
--- a/tools/testfiles/tpbitsSignedInt8.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedInt8.ddl
diff --git a/tools/testfiles/tpbitsSignedIntWhole.ddl b/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl
index 598c446..598c446 100644
--- a/tools/testfiles/tpbitsSignedIntWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl
diff --git a/tools/testfiles/tpbitsSignedLong.ddl b/tools/testfiles/pbits/tpbitsSignedLong.ddl
index b3eba61..b3eba61 100644
--- a/tools/testfiles/tpbitsSignedLong.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLong.ddl
diff --git a/tools/testfiles/tpbitsSignedLong16.ddl b/tools/testfiles/pbits/tpbitsSignedLong16.ddl
index 83fa889..83fa889 100644
--- a/tools/testfiles/tpbitsSignedLong16.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLong16.ddl
diff --git a/tools/testfiles/tpbitsSignedLong8.ddl b/tools/testfiles/pbits/tpbitsSignedLong8.ddl
index e99b1d0..e99b1d0 100644
--- a/tools/testfiles/tpbitsSignedLong8.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLong8.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLong.ddl b/tools/testfiles/pbits/tpbitsSignedLongLong.ddl
index 2be8a55..2be8a55 100644
--- a/tools/testfiles/tpbitsSignedLongLong.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLong.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLong16.ddl b/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl
index 44e336d..44e336d 100644
--- a/tools/testfiles/tpbitsSignedLongLong16.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLong32.ddl b/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl
index 6ab4ac4..6ab4ac4 100644
--- a/tools/testfiles/tpbitsSignedLongLong32.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLongWhole.ddl b/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl
index 134f3be..134f3be 100644
--- a/tools/testfiles/tpbitsSignedLongLongWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLongWhole1.ddl b/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl
index 7431670..7431670 100644
--- a/tools/testfiles/tpbitsSignedLongLongWhole1.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl
diff --git a/tools/testfiles/tpbitsSignedLongLongWhole63.ddl b/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl
index c7cc65f..c7cc65f 100644
--- a/tools/testfiles/tpbitsSignedLongLongWhole63.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl
diff --git a/tools/testfiles/tpbitsSignedLongWhole.ddl b/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl
index e583f1d..e583f1d 100644
--- a/tools/testfiles/tpbitsSignedLongWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl
diff --git a/tools/testfiles/tpbitsSignedWhole.ddl b/tools/testfiles/pbits/tpbitsSignedWhole.ddl
index f044e23..f044e23 100644
--- a/tools/testfiles/tpbitsSignedWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsSignedWhole.ddl
diff --git a/tools/testfiles/tpbitsUnsigned.ddl b/tools/testfiles/pbits/tpbitsUnsigned.ddl
index 9e7ac50..9e7ac50 100644
--- a/tools/testfiles/tpbitsUnsigned.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsigned.ddl
diff --git a/tools/testfiles/tpbitsUnsigned2.ddl b/tools/testfiles/pbits/tpbitsUnsigned2.ddl
index b7e6f79..b7e6f79 100644
--- a/tools/testfiles/tpbitsUnsigned2.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsigned2.ddl
diff --git a/tools/testfiles/tpbitsUnsigned4.ddl b/tools/testfiles/pbits/tpbitsUnsigned4.ddl
index d25d838..d25d838 100644
--- a/tools/testfiles/tpbitsUnsigned4.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsigned4.ddl
diff --git a/tools/testfiles/tpbitsUnsignedInt.ddl b/tools/testfiles/pbits/tpbitsUnsignedInt.ddl
index 5e0fefe..5e0fefe 100644
--- a/tools/testfiles/tpbitsUnsignedInt.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedInt.ddl
diff --git a/tools/testfiles/tpbitsUnsignedInt4.ddl b/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl
index 0d3e38f..0d3e38f 100644
--- a/tools/testfiles/tpbitsUnsignedInt4.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl
diff --git a/tools/testfiles/tpbitsUnsignedInt8.ddl b/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl
index 861ed3e..861ed3e 100644
--- a/tools/testfiles/tpbitsUnsignedInt8.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl
diff --git a/tools/testfiles/tpbitsUnsignedIntWhole.ddl b/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl
index c054011..c054011 100644
--- a/tools/testfiles/tpbitsUnsignedIntWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLong.ddl b/tools/testfiles/pbits/tpbitsUnsignedLong.ddl
index 9f8bcb4..9f8bcb4 100644
--- a/tools/testfiles/tpbitsUnsignedLong.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLong.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLong16.ddl b/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl
index 7a1984f..7a1984f 100644
--- a/tools/testfiles/tpbitsUnsignedLong16.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLong8.ddl b/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl
index 17b896c..17b896c 100644
--- a/tools/testfiles/tpbitsUnsignedLong8.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLong.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl
index 1cd9a6c..1cd9a6c 100644
--- a/tools/testfiles/tpbitsUnsignedLongLong.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLong16.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl
index f8b0189..f8b0189 100644
--- a/tools/testfiles/tpbitsUnsignedLongLong16.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLong32.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl
index befaf5b..befaf5b 100644
--- a/tools/testfiles/tpbitsUnsignedLongLong32.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl
index 27c8879..27c8879 100644
--- a/tools/testfiles/tpbitsUnsignedLongLongWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl
index 0302105..0302105 100644
--- a/tools/testfiles/tpbitsUnsignedLongLongWhole1.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl
index 6a9b503..6a9b503 100644
--- a/tools/testfiles/tpbitsUnsignedLongLongWhole63.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl
diff --git a/tools/testfiles/tpbitsUnsignedLongWhole.ddl b/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl
index 50ad02f..50ad02f 100644
--- a/tools/testfiles/tpbitsUnsignedLongWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl
diff --git a/tools/testfiles/tpbitsUnsignedWhole.ddl b/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl
index 7c9e736..7c9e736 100644
--- a/tools/testfiles/tpbitsUnsignedWhole.ddl
+++ b/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl
diff --git a/tools/testfiles/vds/1_a.h5 b/tools/testfiles/vds/1_a.h5
new file mode 100644
index 0000000..533728f
--- /dev/null
+++ b/tools/testfiles/vds/1_a.h5
diff --git a/tools/testfiles/vds/1_b.h5 b/tools/testfiles/vds/1_b.h5
new file mode 100644
index 0000000..4195588
--- /dev/null
+++ b/tools/testfiles/vds/1_b.h5
diff --git a/tools/testfiles/vds/1_c.h5 b/tools/testfiles/vds/1_c.h5
new file mode 100644
index 0000000..cc6c2c7
--- /dev/null
+++ b/tools/testfiles/vds/1_c.h5
diff --git a/tools/testfiles/vds/1_d.h5 b/tools/testfiles/vds/1_d.h5
new file mode 100644
index 0000000..20bea0b
--- /dev/null
+++ b/tools/testfiles/vds/1_d.h5
diff --git a/tools/testfiles/vds/1_e.h5 b/tools/testfiles/vds/1_e.h5
new file mode 100644
index 0000000..43e9cea
--- /dev/null
+++ b/tools/testfiles/vds/1_e.h5
diff --git a/tools/testfiles/vds/1_f.h5 b/tools/testfiles/vds/1_f.h5
new file mode 100644
index 0000000..c49843e
--- /dev/null
+++ b/tools/testfiles/vds/1_f.h5
diff --git a/tools/testfiles/vds/1_vds.h5 b/tools/testfiles/vds/1_vds.h5
new file mode 100644
index 0000000..59c76ea
--- /dev/null
+++ b/tools/testfiles/vds/1_vds.h5
diff --git a/tools/testfiles/vds/2_a.h5 b/tools/testfiles/vds/2_a.h5
new file mode 100644
index 0000000..bba7854
--- /dev/null
+++ b/tools/testfiles/vds/2_a.h5
diff --git a/tools/testfiles/vds/2_b.h5 b/tools/testfiles/vds/2_b.h5
new file mode 100644
index 0000000..a30ff72
--- /dev/null
+++ b/tools/testfiles/vds/2_b.h5
diff --git a/tools/testfiles/vds/2_c.h5 b/tools/testfiles/vds/2_c.h5
new file mode 100644
index 0000000..bec8e65
--- /dev/null
+++ b/tools/testfiles/vds/2_c.h5
diff --git a/tools/testfiles/vds/2_d.h5 b/tools/testfiles/vds/2_d.h5
new file mode 100644
index 0000000..605ff85
--- /dev/null
+++ b/tools/testfiles/vds/2_d.h5
diff --git a/tools/testfiles/vds/2_e.h5 b/tools/testfiles/vds/2_e.h5
new file mode 100644
index 0000000..a033de1
--- /dev/null
+++ b/tools/testfiles/vds/2_e.h5
diff --git a/tools/testfiles/vds/2_vds.h5 b/tools/testfiles/vds/2_vds.h5
new file mode 100644
index 0000000..85f075a
--- /dev/null
+++ b/tools/testfiles/vds/2_vds.h5
diff --git a/tools/testfiles/vds/3_1_vds.h5 b/tools/testfiles/vds/3_1_vds.h5
new file mode 100644
index 0000000..9661907
--- /dev/null
+++ b/tools/testfiles/vds/3_1_vds.h5
diff --git a/tools/testfiles/vds/3_2_vds.h5 b/tools/testfiles/vds/3_2_vds.h5
new file mode 100644
index 0000000..c39fee4
--- /dev/null
+++ b/tools/testfiles/vds/3_2_vds.h5
diff --git a/tools/testfiles/vds/4_0.h5 b/tools/testfiles/vds/4_0.h5
new file mode 100644
index 0000000..3f5b594
--- /dev/null
+++ b/tools/testfiles/vds/4_0.h5
diff --git a/tools/testfiles/vds/4_1.h5 b/tools/testfiles/vds/4_1.h5
new file mode 100644
index 0000000..0b91398
--- /dev/null
+++ b/tools/testfiles/vds/4_1.h5
diff --git a/tools/testfiles/vds/4_2.h5 b/tools/testfiles/vds/4_2.h5
new file mode 100644
index 0000000..0ea8f8e
--- /dev/null
+++ b/tools/testfiles/vds/4_2.h5
diff --git a/tools/testfiles/vds/4_vds.h5 b/tools/testfiles/vds/4_vds.h5
new file mode 100644
index 0000000..de3457a
--- /dev/null
+++ b/tools/testfiles/vds/4_vds.h5
diff --git a/tools/testfiles/vds/5_a.h5 b/tools/testfiles/vds/5_a.h5
new file mode 100644
index 0000000..189e3b1
--- /dev/null
+++ b/tools/testfiles/vds/5_a.h5
diff --git a/tools/testfiles/vds/5_b.h5 b/tools/testfiles/vds/5_b.h5
new file mode 100644
index 0000000..49b85ac
--- /dev/null
+++ b/tools/testfiles/vds/5_b.h5
diff --git a/tools/testfiles/vds/5_c.h5 b/tools/testfiles/vds/5_c.h5
new file mode 100644
index 0000000..5ea371e
--- /dev/null
+++ b/tools/testfiles/vds/5_c.h5
diff --git a/tools/testfiles/vds/5_vds.h5 b/tools/testfiles/vds/5_vds.h5
new file mode 100644
index 0000000..bee4974
--- /dev/null
+++ b/tools/testfiles/vds/5_vds.h5
diff --git a/tools/testfiles/vds/tvds-1.ddl b/tools/testfiles/vds/tvds-1.ddl
new file mode 100644
index 0000000..47fd413
--- /dev/null
+++ b/tools/testfiles/vds/tvds-1.ddl
@@ -0,0 +1,100 @@
+HDF5 "1_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( H5S_UNLIMITED, 18, 8 ) }
+      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/testfiles/vds/tvds-2.ddl b/tools/testfiles/vds/tvds-2.ddl
new file mode 100644
index 0000000..5f2ae16
--- /dev/null
+++ b/tools/testfiles/vds/tvds-2.ddl
@@ -0,0 +1,58 @@
+HDF5 "2_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 6, 8, 14 ) / ( H5S_UNLIMITED, 8, 14 ) }
+      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/testfiles/vds/tvds-3_1.ddl b/tools/testfiles/vds/tvds-3_1.ddl
new file mode 100644
index 0000000..7d7d8b6
--- /dev/null
+++ b/tools/testfiles/vds/tvds-3_1.ddl
@@ -0,0 +1,135 @@
+HDF5 "3_1_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 5, 25, 8 ) / ( H5S_UNLIMITED, 25, 8 ) }
+      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/testfiles/vds/tvds-3_2.ddl b/tools/testfiles/vds/tvds-3_2.ddl
new file mode 100644
index 0000000..baec6f0
--- /dev/null
+++ b/tools/testfiles/vds/tvds-3_2.ddl
@@ -0,0 +1,166 @@
+HDF5 "3_2_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 6, 13, 19 ) / ( H5S_UNLIMITED, 13, 19 ) }
+      DATA {
+      (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (0,0,15): -9, -9, -9, -9,
+      (0,1,0): -9, 10, 10, 10, 10, 10, 10, 10, -9, 40, 40, 40, 40, 40, 40,
+      (0,1,15): 40, -9, -9, -9,
+      (0,2,0): -9, 10, 10, 10, 10, 10, 10, 10, -9, 40, 40, 40, 40, 40, 40,
+      (0,2,15): 40, -9, -9, -9,
+      (0,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,3,15): 40, -9, -9, -9,
+      (0,4,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,4,15): 40, -9, -9, -9,
+      (0,5,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,5,15): 40, -9, -9, -9,
+      (0,6,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, -9, -9, -9, -9, -9, -9,
+      (0,6,15): -9, -9, -9, -9,
+      (0,7,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, -9, -9, -9, -9, -9, -9,
+      (0,7,15): -9, -9, -9, -9,
+      (0,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,8,15): 50, 50, 50, 50,
+      (0,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,9,15): 50, 50, 50, 50,
+      (0,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,10,15): 50, 50, 50, 50,
+      (0,11,0): -9, -9, -9, -9, 30, 30, 30, 30, 30, 30, 30, -9, -9, -9, -9,
+      (0,11,15): -9, -9, -9, -9,
+      (0,12,0): -9, -9, -9, -9, 30, 30, 30, 30, 30, 30, 30, -9, -9, -9, -9,
+      (0,12,15): -9, -9, -9, -9,
+      (1,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,0,15): -9, -9, -9, -9,
+      (1,1,0): -9, 11, 11, 11, 11, 11, 11, 11, -9, 41, 41, 41, 41, 41, 41,
+      (1,1,15): 41, -9, -9, -9,
+      (1,2,0): -9, 11, 11, 11, 11, 11, 11, 11, -9, 41, 41, 41, 41, 41, 41,
+      (1,2,15): 41, -9, -9, -9,
+      (1,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,3,15): 41, -9, -9, -9,
+      (1,4,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,4,15): 41, -9, -9, -9,
+      (1,5,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,5,15): 41, -9, -9, -9,
+      (1,6,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,6,15): -9, -9, -9, -9,
+      (1,7,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,7,15): -9, -9, -9, -9,
+      (1,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,8,15): 51, 51, 51, 51,
+      (1,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,9,15): 51, 51, 51, 51,
+      (1,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,10,15): 51, 51, 51, 51,
+      (1,11,0): -9, -9, -9, -9, 31, 31, 31, 31, 31, 31, 31, -9, -9, -9, -9,
+      (1,11,15): -9, -9, -9, -9,
+      (1,12,0): -9, -9, -9, -9, 31, 31, 31, 31, 31, 31, 31, -9, -9, -9, -9,
+      (1,12,15): -9, -9, -9, -9,
+      (2,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,0,15): -9, -9, -9, -9,
+      (2,1,0): -9, 12, 12, 12, 12, 12, 12, 12, -9, 42, 42, 42, 42, 42, 42,
+      (2,1,15): 42, -9, -9, -9,
+      (2,2,0): -9, 12, 12, 12, 12, 12, 12, 12, -9, 42, 42, 42, 42, 42, 42,
+      (2,2,15): 42, -9, -9, -9,
+      (2,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,3,15): 42, -9, -9, -9,
+      (2,4,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,4,15): 42, -9, -9, -9,
+      (2,5,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,5,15): 42, -9, -9, -9,
+      (2,6,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,6,15): -9, -9, -9, -9,
+      (2,7,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,7,15): -9, -9, -9, -9,
+      (2,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,8,15): 52, 52, 52, 52,
+      (2,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,9,15): 52, 52, 52, 52,
+      (2,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,10,15): 52, 52, 52, 52,
+      (2,11,0): -9, -9, -9, -9, 32, 32, 32, 32, 32, 32, 32, -9, -9, -9, -9,
+      (2,11,15): -9, -9, -9, -9,
+      (2,12,0): -9, -9, -9, -9, 32, 32, 32, 32, 32, 32, 32, -9, -9, -9, -9,
+      (2,12,15): -9, -9, -9, -9,
+      (3,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,0,15): -9, -9, -9, -9,
+      (3,1,0): -9, 13, 13, 13, 13, 13, 13, 13, -9, 43, 43, 43, 43, 43, 43,
+      (3,1,15): 43, -9, -9, -9,
+      (3,2,0): -9, 13, 13, 13, 13, 13, 13, 13, -9, 43, 43, 43, 43, 43, 43,
+      (3,2,15): 43, -9, -9, -9,
+      (3,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,3,15): 43, -9, -9, -9,
+      (3,4,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,4,15): 43, -9, -9, -9,
+      (3,5,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,5,15): 43, -9, -9, -9,
+      (3,6,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,6,15): -9, -9, -9, -9,
+      (3,7,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,7,15): -9, -9, -9, -9,
+      (3,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,8,15): 53, 53, 53, 53,
+      (3,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,9,15): 53, 53, 53, 53,
+      (3,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,10,15): 53, 53, 53, 53,
+      (3,11,0): -9, -9, -9, -9, 33, 33, 33, 33, 33, 33, 33, -9, -9, -9, -9,
+      (3,11,15): -9, -9, -9, -9,
+      (3,12,0): -9, -9, -9, -9, 33, 33, 33, 33, 33, 33, 33, -9, -9, -9, -9,
+      (3,12,15): -9, -9, -9, -9,
+      (4,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,0,15): -9, -9, -9, -9,
+      (4,1,0): -9, 14, 14, 14, 14, 14, 14, 14, -9, 44, 44, 44, 44, 44, 44,
+      (4,1,15): 44, -9, -9, -9,
+      (4,2,0): -9, 14, 14, 14, 14, 14, 14, 14, -9, 44, 44, 44, 44, 44, 44,
+      (4,2,15): 44, -9, -9, -9,
+      (4,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,3,15): 44, -9, -9, -9,
+      (4,4,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,4,15): 44, -9, -9, -9,
+      (4,5,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,5,15): 44, -9, -9, -9,
+      (4,6,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,6,15): -9, -9, -9, -9,
+      (4,7,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,7,15): -9, -9, -9, -9,
+      (4,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,8,15): 54, 54, 54, 54,
+      (4,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,9,15): 54, 54, 54, 54,
+      (4,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,10,15): 54, 54, 54, 54,
+      (4,11,0): -9, -9, -9, -9, 34, 34, 34, 34, 34, 34, 34, -9, -9, -9, -9,
+      (4,11,15): -9, -9, -9, -9,
+      (4,12,0): -9, -9, -9, -9, 34, 34, 34, 34, 34, 34, 34, -9, -9, -9, -9,
+      (4,12,15): -9, -9, -9, -9,
+      (5,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,0,15): -9, -9, -9, -9,
+      (5,1,0): -9, 15, 15, 15, 15, 15, 15, 15, -9, 45, 45, 45, 45, 45, 45,
+      (5,1,15): 45, -9, -9, -9,
+      (5,2,0): -9, 15, 15, 15, 15, 15, 15, 15, -9, 45, 45, 45, 45, 45, 45,
+      (5,2,15): 45, -9, -9, -9,
+      (5,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,3,15): 45, -9, -9, -9,
+      (5,4,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,4,15): 45, -9, -9, -9,
+      (5,5,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,5,15): 45, -9, -9, -9,
+      (5,6,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,6,15): -9, -9, -9, -9,
+      (5,7,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,7,15): -9, -9, -9, -9,
+      (5,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,8,15): 55, 55, 55, 55,
+      (5,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,9,15): 55, 55, 55, 55,
+      (5,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,10,15): 55, 55, 55, 55,
+      (5,11,0): -9, -9, -9, -9, 35, 35, 35, 35, 35, 35, 35, -9, -9, -9, -9,
+      (5,11,15): -9, -9, -9, -9,
+      (5,12,0): -9, -9, -9, -9, 35, 35, 35, 35, 35, 35, 35, -9, -9, -9, -9,
+      (5,12,15): -9, -9, -9, -9
+      }
+   }
+}
+}
diff --git a/tools/testfiles/vds/tvds-4.ddl b/tools/testfiles/vds/tvds-4.ddl
new file mode 100644
index 0000000..1832724
--- /dev/null
+++ b/tools/testfiles/vds/tvds-4.ddl
@@ -0,0 +1,46 @@
+HDF5 "4_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( H5S_UNLIMITED, 4, 4 ) }
+      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/testfiles/vds/tvds-5.ddl b/tools/testfiles/vds/tvds-5.ddl
new file mode 100644
index 0000000..f59017b
--- /dev/null
+++ b/tools/testfiles/vds/tvds-5.ddl
@@ -0,0 +1,46 @@
+HDF5 "5_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( H5S_UNLIMITED, 4, 4 ) }
+      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): 20, 20, 20, 20,
+      (1,1,0): 20, 20, 20, 20,
+      (1,2,0): 20, 20, 20, 20,
+      (1,3,0): 20, 20, 20, 20,
+      (2,0,0): 30, 30, 30, 30,
+      (2,1,0): 30, 30, 30, 30,
+      (2,2,0): 30, 30, 30, 30,
+      (2,3,0): 30, 30, 30, 30,
+      (3,0,0): 11, 11, 11, 11,
+      (3,1,0): 11, 11, 11, 11,
+      (3,2,0): 11, 11, 11, 11,
+      (3,3,0): 11, 11, 11, 11,
+      (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): 31, 31, 31, 31,
+      (5,1,0): 31, 31, 31, 31,
+      (5,2,0): 31, 31, 31, 31,
+      (5,3,0): 31, 31, 31, 31,
+      (6,0,0): 12, 12, 12, 12,
+      (6,1,0): 12, 12, 12, 12,
+      (6,2,0): 12, 12, 12, 12,
+      (6,3,0): 12, 12, 12, 12,
+      (7,0,0): 22, 22, 22, 22,
+      (7,1,0): 22, 22, 22, 22,
+      (7,2,0): 22, 22, 22, 22,
+      (7,3,0): 22, 22, 22, 22,
+      (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/testfiles/vds/tvds_layout-1.ddl b/tools/testfiles/vds/tvds_layout-1.ddl
new file mode 100644
index 0000000..5d8a62c
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-1.ddl
@@ -0,0 +1,232 @@
+HDF5 "1_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 5, 18, 8 ) / ( H5S_UNLIMITED, 18, 8 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_a.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 1 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,2,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+         MAPPING 2 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,6,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_c.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 3 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,8,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_d.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+         MAPPING 4 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,12,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_e.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 5 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,14,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_f.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+      }
+      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/testfiles/vds/tvds_layout-2.ddl b/tools/testfiles/vds/tvds_layout-2.ddl
new file mode 100644
index 0000000..af6b718
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-2.ddl
@@ -0,0 +1,170 @@
+HDF5 "2_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 6, 8, 14 ) / ( H5S_UNLIMITED, 8, 14 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+            SOURCE {
+               FILE "2_a.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+         }
+         MAPPING 1 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,2,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,7)
+               }
+            }
+            SOURCE {
+               FILE "2_b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,7)
+               }
+            }
+         }
+         MAPPING 2 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,6,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+            SOURCE {
+               FILE "2_c.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+         }
+         MAPPING 3 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,7)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,5,7)
+               }
+            }
+            SOURCE {
+               FILE "2_d.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,5,7)
+               }
+            }
+         }
+         MAPPING 4 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,5,7)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,3,7)
+               }
+            }
+            SOURCE {
+               FILE "2_e.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,3,7)
+               }
+            }
+         }
+      }
+      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/testfiles/vds/tvds_layout-3_1.ddl b/tools/testfiles/vds/tvds_layout-3_1.ddl
new file mode 100644
index 0000000..968327d
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-3_1.ddl
@@ -0,0 +1,267 @@
+HDF5 "3_1_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 5, 25, 8 ) / ( H5S_UNLIMITED, 25, 8 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,1,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_a.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 1 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,4,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+         MAPPING 2 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,9,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_c.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 3 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,12,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_d.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+         MAPPING 4 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,17,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+            SOURCE {
+               FILE "1_e.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,8)
+               }
+            }
+         }
+         MAPPING 5 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,20,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+            SOURCE {
+               FILE "1_f.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,8)
+               }
+            }
+         }
+      }
+      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/testfiles/vds/tvds_layout-3_2.ddl b/tools/testfiles/vds/tvds_layout-3_2.ddl
new file mode 100644
index 0000000..7e14ec2
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-3_2.ddl
@@ -0,0 +1,278 @@
+HDF5 "3_2_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 6, 13, 19 ) / ( H5S_UNLIMITED, 13, 19 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,1,1)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+            SOURCE {
+               FILE "2_a.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+         }
+         MAPPING 1 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,4,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,7)
+               }
+            }
+            SOURCE {
+               FILE "2_b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,7)
+               }
+            }
+         }
+         MAPPING 2 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,11,4)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+            SOURCE {
+               FILE "2_c.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,2,7)
+               }
+            }
+         }
+         MAPPING 3 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,1,9)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,5,7)
+               }
+            }
+            SOURCE {
+               FILE "2_d.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,5,7)
+               }
+            }
+         }
+         MAPPING 4 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,8,12)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,3,7)
+               }
+            }
+            SOURCE {
+               FILE "2_e.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,3,7)
+               }
+            }
+         }
+      }
+      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, -9, -9, -9, -9, -9, -9, -9,
+      (0,0,15): -9, -9, -9, -9,
+      (0,1,0): -9, 10, 10, 10, 10, 10, 10, 10, -9, 40, 40, 40, 40, 40, 40,
+      (0,1,15): 40, -9, -9, -9,
+      (0,2,0): -9, 10, 10, 10, 10, 10, 10, 10, -9, 40, 40, 40, 40, 40, 40,
+      (0,2,15): 40, -9, -9, -9,
+      (0,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,3,15): 40, -9, -9, -9,
+      (0,4,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,4,15): 40, -9, -9, -9,
+      (0,5,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, 40, 40, 40, 40, 40, 40,
+      (0,5,15): 40, -9, -9, -9,
+      (0,6,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, -9, -9, -9, -9, -9, -9,
+      (0,6,15): -9, -9, -9, -9,
+      (0,7,0): 20, 20, 20, 20, 20, 20, 20, -9, -9, -9, -9, -9, -9, -9, -9,
+      (0,7,15): -9, -9, -9, -9,
+      (0,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,8,15): 50, 50, 50, 50,
+      (0,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,9,15): 50, 50, 50, 50,
+      (0,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 50, 50, 50,
+      (0,10,15): 50, 50, 50, 50,
+      (0,11,0): -9, -9, -9, -9, 30, 30, 30, 30, 30, 30, 30, -9, -9, -9, -9,
+      (0,11,15): -9, -9, -9, -9,
+      (0,12,0): -9, -9, -9, -9, 30, 30, 30, 30, 30, 30, 30, -9, -9, -9, -9,
+      (0,12,15): -9, -9, -9, -9,
+      (1,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,0,15): -9, -9, -9, -9,
+      (1,1,0): -9, 11, 11, 11, 11, 11, 11, 11, -9, 41, 41, 41, 41, 41, 41,
+      (1,1,15): 41, -9, -9, -9,
+      (1,2,0): -9, 11, 11, 11, 11, 11, 11, 11, -9, 41, 41, 41, 41, 41, 41,
+      (1,2,15): 41, -9, -9, -9,
+      (1,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,3,15): 41, -9, -9, -9,
+      (1,4,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,4,15): 41, -9, -9, -9,
+      (1,5,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, 41, 41, 41, 41, 41, 41,
+      (1,5,15): 41, -9, -9, -9,
+      (1,6,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,6,15): -9, -9, -9, -9,
+      (1,7,0): 21, 21, 21, 21, 21, 21, 21, -9, -9, -9, -9, -9, -9, -9, -9,
+      (1,7,15): -9, -9, -9, -9,
+      (1,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,8,15): 51, 51, 51, 51,
+      (1,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,9,15): 51, 51, 51, 51,
+      (1,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 51, 51, 51,
+      (1,10,15): 51, 51, 51, 51,
+      (1,11,0): -9, -9, -9, -9, 31, 31, 31, 31, 31, 31, 31, -9, -9, -9, -9,
+      (1,11,15): -9, -9, -9, -9,
+      (1,12,0): -9, -9, -9, -9, 31, 31, 31, 31, 31, 31, 31, -9, -9, -9, -9,
+      (1,12,15): -9, -9, -9, -9,
+      (2,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,0,15): -9, -9, -9, -9,
+      (2,1,0): -9, 12, 12, 12, 12, 12, 12, 12, -9, 42, 42, 42, 42, 42, 42,
+      (2,1,15): 42, -9, -9, -9,
+      (2,2,0): -9, 12, 12, 12, 12, 12, 12, 12, -9, 42, 42, 42, 42, 42, 42,
+      (2,2,15): 42, -9, -9, -9,
+      (2,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,3,15): 42, -9, -9, -9,
+      (2,4,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,4,15): 42, -9, -9, -9,
+      (2,5,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, 42, 42, 42, 42, 42, 42,
+      (2,5,15): 42, -9, -9, -9,
+      (2,6,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,6,15): -9, -9, -9, -9,
+      (2,7,0): 22, 22, 22, 22, 22, 22, 22, -9, -9, -9, -9, -9, -9, -9, -9,
+      (2,7,15): -9, -9, -9, -9,
+      (2,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,8,15): 52, 52, 52, 52,
+      (2,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,9,15): 52, 52, 52, 52,
+      (2,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 52, 52, 52,
+      (2,10,15): 52, 52, 52, 52,
+      (2,11,0): -9, -9, -9, -9, 32, 32, 32, 32, 32, 32, 32, -9, -9, -9, -9,
+      (2,11,15): -9, -9, -9, -9,
+      (2,12,0): -9, -9, -9, -9, 32, 32, 32, 32, 32, 32, 32, -9, -9, -9, -9,
+      (2,12,15): -9, -9, -9, -9,
+      (3,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,0,15): -9, -9, -9, -9,
+      (3,1,0): -9, 13, 13, 13, 13, 13, 13, 13, -9, 43, 43, 43, 43, 43, 43,
+      (3,1,15): 43, -9, -9, -9,
+      (3,2,0): -9, 13, 13, 13, 13, 13, 13, 13, -9, 43, 43, 43, 43, 43, 43,
+      (3,2,15): 43, -9, -9, -9,
+      (3,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,3,15): 43, -9, -9, -9,
+      (3,4,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,4,15): 43, -9, -9, -9,
+      (3,5,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, 43, 43, 43, 43, 43, 43,
+      (3,5,15): 43, -9, -9, -9,
+      (3,6,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,6,15): -9, -9, -9, -9,
+      (3,7,0): 23, 23, 23, 23, 23, 23, 23, -9, -9, -9, -9, -9, -9, -9, -9,
+      (3,7,15): -9, -9, -9, -9,
+      (3,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,8,15): 53, 53, 53, 53,
+      (3,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,9,15): 53, 53, 53, 53,
+      (3,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 53, 53, 53,
+      (3,10,15): 53, 53, 53, 53,
+      (3,11,0): -9, -9, -9, -9, 33, 33, 33, 33, 33, 33, 33, -9, -9, -9, -9,
+      (3,11,15): -9, -9, -9, -9,
+      (3,12,0): -9, -9, -9, -9, 33, 33, 33, 33, 33, 33, 33, -9, -9, -9, -9,
+      (3,12,15): -9, -9, -9, -9,
+      (4,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,0,15): -9, -9, -9, -9,
+      (4,1,0): -9, 14, 14, 14, 14, 14, 14, 14, -9, 44, 44, 44, 44, 44, 44,
+      (4,1,15): 44, -9, -9, -9,
+      (4,2,0): -9, 14, 14, 14, 14, 14, 14, 14, -9, 44, 44, 44, 44, 44, 44,
+      (4,2,15): 44, -9, -9, -9,
+      (4,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,3,15): 44, -9, -9, -9,
+      (4,4,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,4,15): 44, -9, -9, -9,
+      (4,5,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, 44, 44, 44, 44, 44, 44,
+      (4,5,15): 44, -9, -9, -9,
+      (4,6,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,6,15): -9, -9, -9, -9,
+      (4,7,0): 24, 24, 24, 24, 24, 24, 24, -9, -9, -9, -9, -9, -9, -9, -9,
+      (4,7,15): -9, -9, -9, -9,
+      (4,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,8,15): 54, 54, 54, 54,
+      (4,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,9,15): 54, 54, 54, 54,
+      (4,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 54, 54, 54,
+      (4,10,15): 54, 54, 54, 54,
+      (4,11,0): -9, -9, -9, -9, 34, 34, 34, 34, 34, 34, 34, -9, -9, -9, -9,
+      (4,11,15): -9, -9, -9, -9,
+      (4,12,0): -9, -9, -9, -9, 34, 34, 34, 34, 34, 34, 34, -9, -9, -9, -9,
+      (4,12,15): -9, -9, -9, -9,
+      (5,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,0,15): -9, -9, -9, -9,
+      (5,1,0): -9, 15, 15, 15, 15, 15, 15, 15, -9, 45, 45, 45, 45, 45, 45,
+      (5,1,15): 45, -9, -9, -9,
+      (5,2,0): -9, 15, 15, 15, 15, 15, 15, 15, -9, 45, 45, 45, 45, 45, 45,
+      (5,2,15): 45, -9, -9, -9,
+      (5,3,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,3,15): 45, -9, -9, -9,
+      (5,4,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,4,15): 45, -9, -9, -9,
+      (5,5,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, 45, 45, 45, 45, 45, 45,
+      (5,5,15): 45, -9, -9, -9,
+      (5,6,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,6,15): -9, -9, -9, -9,
+      (5,7,0): 25, 25, 25, 25, 25, 25, 25, -9, -9, -9, -9, -9, -9, -9, -9,
+      (5,7,15): -9, -9, -9, -9,
+      (5,8,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,8,15): 55, 55, 55, 55,
+      (5,9,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,9,15): 55, 55, 55, 55,
+      (5,10,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, 55, 55, 55,
+      (5,10,15): 55, 55, 55, 55,
+      (5,11,0): -9, -9, -9, -9, 35, 35, 35, 35, 35, 35, 35, -9, -9, -9, -9,
+      (5,11,15): -9, -9, -9, -9,
+      (5,12,0): -9, -9, -9, -9, 35, 35, 35, 35, 35, 35, 35, -9, -9, -9, -9,
+      (5,12,15): -9, -9, -9, -9
+      }
+   }
+}
+}
diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/testfiles/vds/tvds_layout-4.ddl
new file mode 100644
index 0000000..018644e
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-4.ddl
@@ -0,0 +1,78 @@
+HDF5 "4_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( H5S_UNLIMITED, 4, 4 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (3,1,1)
+                  COUNT (H5S_UNLIMITED,1,1)
+                  BLOCK (3,4,4)
+               }
+            }
+            SOURCE {
+               FILE "4_%b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (3,4,4)
+               }
+            }
+         }
+      }
+      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,
+      (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/testfiles/vds/tvds_layout-5.ddl b/tools/testfiles/vds/tvds_layout-5.ddl
new file mode 100644
index 0000000..b43629a
--- /dev/null
+++ b/tools/testfiles/vds/tvds_layout-5.ddl
@@ -0,0 +1,118 @@
+HDF5 "5_vds.h5" {
+GROUP "/" {
+   DATASET "vds_dset" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 9, 4, 4 ) / ( H5S_UNLIMITED, 4, 4 ) }
+      STORAGE_LAYOUT {
+         MAPPING 0 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (3,1,1)
+                  COUNT (H5S_UNLIMITED,1,1)
+                  BLOCK (1,4,4)
+               }
+            }
+            SOURCE {
+               FILE "5_a.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,4)
+               }
+            }
+         }
+         MAPPING 1 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (1,0,0)
+                  STRIDE (3,1,1)
+                  COUNT (H5S_UNLIMITED,1,1)
+                  BLOCK (1,4,4)
+               }
+            }
+            SOURCE {
+               FILE "5_b.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,4)
+               }
+            }
+         }
+         MAPPING 2 { 
+            VIRTUAL {
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (2,0,0)
+                  STRIDE (3,1,1)
+                  COUNT (H5S_UNLIMITED,1,1)
+                  BLOCK (1,4,4)
+               }
+            }
+            SOURCE {
+               FILE "5_c.h5"
+               DATASET "/source_dset"
+               SELECTION REGULAR_HYPERSLAB { 
+                  START (0,0,0)
+                  STRIDE (1,1,1)
+                  COUNT (1,1,1)
+                  BLOCK (H5S_UNLIMITED,4,4)
+               }
+            }
+         }
+      }
+      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,
+      (0,1,0): 10, 10, 10, 10,
+      (0,2,0): 10, 10, 10, 10,
+      (0,3,0): 10, 10, 10, 10,
+      (1,0,0): 20, 20, 20, 20,
+      (1,1,0): 20, 20, 20, 20,
+      (1,2,0): 20, 20, 20, 20,
+      (1,3,0): 20, 20, 20, 20,
+      (2,0,0): 30, 30, 30, 30,
+      (2,1,0): 30, 30, 30, 30,
+      (2,2,0): 30, 30, 30, 30,
+      (2,3,0): 30, 30, 30, 30,
+      (3,0,0): 11, 11, 11, 11,
+      (3,1,0): 11, 11, 11, 11,
+      (3,2,0): 11, 11, 11, 11,
+      (3,3,0): 11, 11, 11, 11,
+      (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): 31, 31, 31, 31,
+      (5,1,0): 31, 31, 31, 31,
+      (5,2,0): 31, 31, 31, 31,
+      (5,3,0): 31, 31, 31, 31,
+      (6,0,0): 12, 12, 12, 12,
+      (6,1,0): 12, 12, 12, 12,
+      (6,2,0): 12, 12, 12, 12,
+      (6,3,0): 12, 12, 12, 12,
+      (7,0,0): 22, 22, 22, 22,
+      (7,1,0): 22, 22, 22, 22,
+      (7,2,0): 22, 22, 22, 22,
+      (7,3,0): 22, 22, 22, 22,
+      (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
+      }
+   }
+}
+}