Develop tools move (#3580)

Reorganizes the tools files to support the VOL tests

31 files changed, 1166 insertions, 0 deletions

diff --git a/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/expected/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
new file mode 100644
index 0000000..ceb0fe4
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
@@ -0,0 +1 @@
+h5format_convert error: missing file name
diff --git a/tools/test/h5format_convert/expected/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_dname.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/expected/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err
new file mode 100644
index 0000000..361d8a9
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_dname.err
@@ -0,0 +1 @@
+h5format_convert error: No dataset name
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
new file mode 100644
index 0000000..f788913
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext1_f-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
new file mode 100644
index 0000000..6564031
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext1_i-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
new file mode 100644
index 0000000..746de2b
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext1_s-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
new file mode 100644
index 0000000..57781ec
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext2_if-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
new file mode 100644
index 0000000..8fd061d
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext2_is-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
new file mode 100644
index 0000000..435ed46
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext2_sf-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
new file mode 100644
index 0000000..57a78d3
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/h5fc_ext3_isf-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_help.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
new file mode 100644
index 0000000..39450c0
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
@@ -0,0 +1 @@
+h5format_convert error: unable to open dataset "nonexist"
diff --git a/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
new file mode 100644
index 0000000..706ea9d
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
@@ -0,0 +1 @@
+h5format_convert error: unable to open file "nonexist.h5"
diff --git a/tools/test/h5format_convert/expected/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
new file mode 100644
index 0000000..bc0229c
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
@@ -0,0 +1,25 @@
+usage: h5format_convert [OPTIONS] file_name
+  OPTIONS
+   -h, --help                Print a usage message and exit
+   -V, --version             Print version number and exit
+   -v, --verbose             Turn on verbose mode
+   -d dname, --dname=dataset_name    Pathname for the dataset
+   -n, --noop                Perform all the steps except the actual conversion
+
+Examples of use:
+
+h5format_convert -d /group/dataset file_name
+  Convert the dataset </group/dataset> in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert file_name
+  Convert all datasets in the HDF5 file <file_name>:
+    a. chunked dataset: convert the chunk indexing type to version 1 B-tree
+    b. compact/contiguous dataset: downgrade the layout version to 3
+    c. virtual dataset: no action
+
+h5format_convert -n -d /group/dataset file_name
+  Go through all the steps except the actual conversion when 
+  converting the dataset </group/dataset> in the HDF5 file <file_name>.
diff --git a/tools/test/h5format_convert/expected/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
new file mode 100644
index 0000000..c5e55c7
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
@@ -0,0 +1,77 @@
+Process command line options
+Open the file h5fc_v_all-tmp.h5
+Processing all datasets in the file...
+Going to process dataset:/DSET_CONTIGUOUS...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a contiguous dataset: downgrade layout version as needed
+Converting the dataset...
+Done
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_EA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_FA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_NDATA_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_NONE...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_NDATA_EA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_NDATA_FA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_NDATA_NONE...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
new file mode 100644
index 0000000..23f775d
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
@@ -0,0 +1,12 @@
+Process command line options
+Open the file h5fc_v_bt1-tmp.h5
+Going to process dataset: /GROUP/DSET_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
new file mode 100644
index 0000000..066f2d5
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
@@ -0,0 +1,12 @@
+Process command line options
+Open the file h5fc_v_err-tmp.h5
+Processing all datasets in the file...
+Going to process dataset:/DSET_ERR...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Converting the dataset...
+Error encountered
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
new file mode 100644
index 0000000..e72892d
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
@@ -0,0 +1 @@
+h5format_convert error: unable to downgrade dataset "/DSET_ERR"
diff --git a/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
new file mode 100644
index 0000000..1c6d7fb
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
@@ -0,0 +1,14 @@
+Process command line options
+It is noop...
+Open the file h5fc_v_n_1d-tmp.h5
+Going to process dataset: /DSET_EA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Not processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
new file mode 100644
index 0000000..ad00d92
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
@@ -0,0 +1,56 @@
+Process command line options
+It is noop...
+Open the file h5fc_v_n_all-tmp.h5
+Processing all datasets in the file...
+Going to process dataset:/DSET_CONTIGUOUS...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a contiguous dataset: downgrade layout version as needed
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_NDATA_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/DSET_NDATA_EA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_COMPACT...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a contiguous dataset: downgrade layout version as needed
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Going to process dataset:/GROUP/DSET_EA...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is not version 1 B-tree
+Not converting the dataset
+Close the dataset
+Close the dataset creation property list
+Not processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
new file mode 100644
index 0000000..e79b11a
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
@@ -0,0 +1,13 @@
+Process command line options
+It is noop...
+Open the file h5fc_v_ndata_bt1-tmp.h5
+Going to process dataset: /DSET_NDATA_BT2...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a chunked dataset
+Retrieve the dataset's chunk indexing type
+Dataset's chunk indexing type is already version 1 B-tree: no further action
+Close the dataset
+Close the dataset creation property list
+Not processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
new file mode 100644
index 0000000..50575c0
--- /dev/null
+++ b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
@@ -0,0 +1,12 @@
+Process command line options
+Open the file h5fc_v_non_chunked-tmp.h5
+Going to process dataset: /DSET_CONTIGUOUS...
+Open the dataset
+Retrieve the dataset's layout
+Dataset is a contiguous dataset: downgrade layout version as needed
+Converting the dataset...
+Done
+Close the dataset
+Close the dataset creation property list
+Processing the file's superblock...
+Close the file
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
new file mode 100644
index 0000000..45fa3fb
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext1_f-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
new file mode 100644
index 0000000..67a7116
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext1_i-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 1
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
new file mode 100644
index 0000000..7f67d9f
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext1_s-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
new file mode 100644
index 0000000..350d3ba
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext2_if-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
new file mode 100644
index 0000000..6b2b2c3
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext2_is-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
new file mode 100644
index 0000000..4a038e3
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext2_sf-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 32
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}
diff --git a/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
new file mode 100644
index 0000000..602627f
--- /dev/null
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
@@ -0,0 +1,60 @@
+HDF5 "./testfiles/old_h5fc_ext3_isf-tmp.h5" {
+SUPER_BLOCK {
+   SUPERBLOCK_VERSION 2
+   FREELIST_VERSION 0
+   SYMBOLTABLE_VERSION 0
+   OBJECTHEADER_VERSION 0
+   OFFSET_SIZE 8
+   LENGTH_SIZE 8
+   BTREE_RANK 16
+   BTREE_LEAF 4
+   ISTORE_K 64
+   FILE_SPACE_STRATEGY H5F_FSPACE_STRATEGY_FSM_AGGR
+   FREE_SPACE_PERSIST FALSE
+   FREE_SPACE_SECTION_THRESHOLD 1
+   FILE_SPACE_PAGE_SIZE 4096
+   USER_BLOCK {
+      USERBLOCK_SIZE 0
+   }
+}
+GROUP "/" {
+   DATASET "DSET_CONTIGUOUS" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
+   }
+   DATASET "DSET_EA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_FA" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+   }
+   DATASET "DSET_NDATA_BT2" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+   }
+   DATASET "DSET_NONE" {
+      DATATYPE  H5T_STD_I32LE
+      DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+   }
+   GROUP "GROUP" {
+      DATASET "DSET_BT2" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( H5S_UNLIMITED, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_EA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 10, H5S_UNLIMITED ) }
+      }
+      DATASET "DSET_NDATA_FA" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 20, 10 ) }
+      }
+      DATASET "DSET_NDATA_NONE" {
+         DATATYPE  H5T_STD_I32LE
+         DATASPACE  SIMPLE { ( 4, 6 ) / ( 4, 6 ) }
+      }
+   }
+}
+}