[svn-r6771] Purpose:

added more tests, described in the test matrix

Description:
test -r
test -l
expanded -d, -p and -n tests
test different types to include links and named types
test for non supported classes, e.g bitfield, opaque , etc

Platforms tested:
 Linux 2.4 (rockaway)
 SunOS 5.7 (arabica)
 IRIX 6.5 (modi4)

Misc. update:

56 files changed, 848 insertions, 48 deletions

diff --git a/tools/testfiles/h5diff_010.txt b/tools/testfiles/h5diff_010.txt
deleted file mode 100644
index e297cb9..0000000
--- a/tools/testfiles/h5diff_010.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_test1.h6 h5diff_test2.h6'
-#############################
-$h5diff h5diff_test1.h6 h5diff_test2.h6
-h5diff: h5diff_test1.h6: No such file or directory
diff --git a/tools/testfiles/h5diff_03.txt b/tools/testfiles/h5diff_031.txt
index f8e44f0..f8e44f0 100644
--- a/tools/testfiles/h5diff_03.txt
+++ b/tools/testfiles/h5diff_031.txt
diff --git a/tools/testfiles/h5diff_032.txt b/tools/testfiles/h5diff_032.txt
new file mode 100644
index 0000000..c5cb384
--- /dev/null
+++ b/tools/testfiles/h5diff_032.txt
@@ -0,0 +1,93 @@
+#############################
+Expected output for 'h5diff -l h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -l h5diff_test1.h5 h5diff_test2.h5
+File <h5diff_test1.h5>: # of entries = 22
+/compound             datatype
+/dset1.1              dataset
+/dset1.3.1              dataset
+/dset1.3.2              dataset
+/dset1.3.3              dataset
+/dset1.3.4              dataset
+/dset1.3.5              dataset
+/dset1.3.6              dataset
+/dset1.3.7              dataset
+/dset1.3.8              dataset
+/dset1.7              dataset
+/dset1.8              dataset
+/dset1.9              dataset
+/dset2.1a              dataset
+/dset2.2a              dataset
+/dset2.3a              dataset
+/dset2.4a              dataset
+/dset2.5a              dataset
+/dset2.6a              dataset
+/enum             datatype
+/g1.1                group
+/soft                 link
+File <h5diff_test2.h5>: # of entries = 15
+/compound             datatype
+/dset1.4              dataset
+/dset1.5              dataset
+/dset1.6              dataset
+/dset1.7              dataset
+/dset1.8              dataset
+/dset1.9              dataset
+/dset2.1b              dataset
+/dset2.2b              dataset
+/dset2.3b              dataset
+/dset2.4b              dataset
+/dset2.5b              dataset
+/dset2.6b              dataset
+/enum             datatype
+/g1.1                group
+
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_033.txt b/tools/testfiles/h5diff_033.txt
new file mode 100644
index 0000000..a6fdb87
--- /dev/null
+++ b/tools/testfiles/h5diff_033.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -r h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -r h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_04.txt b/tools/testfiles/h5diff_041.txt
index 4626647..4626647 100644
--- a/tools/testfiles/h5diff_04.txt
+++ b/tools/testfiles/h5diff_041.txt
diff --git a/tools/testfiles/h5diff_0410.txt b/tools/testfiles/h5diff_0410.txt
new file mode 100644
index 0000000..ff1059a
--- /dev/null
+++ b/tools/testfiles/h5diff_0410.txt
@@ -0,0 +1,13 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -d 2.3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -d 2.3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+3 differences found
+
diff --git a/tools/testfiles/h5diff_05.txt b/tools/testfiles/h5diff_042.txt
index 3c35097..3c35097 100644
--- a/tools/testfiles/h5diff_05.txt
+++ b/tools/testfiles/h5diff_042.txt
diff --git a/tools/testfiles/h5diff_043.txt b/tools/testfiles/h5diff_043.txt
new file mode 100644
index 0000000..f883bea
--- /dev/null
+++ b/tools/testfiles/h5diff_043.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -d 0 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -d 0 h5diff_test1.h5 h5diff_test2.h5
+<-d 0> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_044.txt b/tools/testfiles/h5diff_044.txt
new file mode 100644
index 0000000..e4af45e
--- /dev/null
+++ b/tools/testfiles/h5diff_044.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -d u h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -d u h5diff_test1.h5 h5diff_test2.h5
+<-d u> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_045.txt b/tools/testfiles/h5diff_045.txt
new file mode 100644
index 0000000..2ded53a
--- /dev/null
+++ b/tools/testfiles/h5diff_045.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -d 0x1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -d 0x1 h5diff_test1.h5 h5diff_test2.h5
+<-d 0x1> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_046.txt b/tools/testfiles/h5diff_046.txt
new file mode 100644
index 0000000..659be75
--- /dev/null
+++ b/tools/testfiles/h5diff_046.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -d 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -d 1 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_047.txt b/tools/testfiles/h5diff_047.txt
new file mode 100644
index 0000000..acb0eca
--- /dev/null
+++ b/tools/testfiles/h5diff_047.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_048.txt b/tools/testfiles/h5diff_048.txt
new file mode 100644
index 0000000..649f9d9
--- /dev/null
+++ b/tools/testfiles/h5diff_048.txt
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -d 7 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -d 7 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+0 differences found
+
diff --git a/tools/testfiles/h5diff_049.txt b/tools/testfiles/h5diff_049.txt
new file mode 100644
index 0000000..a5ecf15
--- /dev/null
+++ b/tools/testfiles/h5diff_049.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -d 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -d 1 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+4 differences found
+
diff --git a/tools/testfiles/h5diff_06.txt b/tools/testfiles/h5diff_051.txt
index 732585b..732585b 100644
--- a/tools/testfiles/h5diff_06.txt
+++ b/tools/testfiles/h5diff_051.txt
diff --git a/tools/testfiles/h5diff_0510.txt b/tools/testfiles/h5diff_0510.txt
new file mode 100644
index 0000000..0a69cb9
--- /dev/null
+++ b/tools/testfiles/h5diff_0510.txt
@@ -0,0 +1,13 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -p 2.3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -p 2.3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+3 differences found
+
diff --git a/tools/testfiles/h5diff_052.txt b/tools/testfiles/h5diff_052.txt
new file mode 100644
index 0000000..5e0198d
--- /dev/null
+++ b/tools/testfiles/h5diff_052.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -p -4 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p -4 h5diff_test1.h5 h5diff_test2.h5
+-4 is an invalid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_053.txt b/tools/testfiles/h5diff_053.txt
new file mode 100644
index 0000000..64a8e83
--- /dev/null
+++ b/tools/testfiles/h5diff_053.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -p 0 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p 0 h5diff_test1.h5 h5diff_test2.h5
+<-p 0> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_054.txt b/tools/testfiles/h5diff_054.txt
new file mode 100644
index 0000000..99b860b
--- /dev/null
+++ b/tools/testfiles/h5diff_054.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -p u h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p u h5diff_test1.h5 h5diff_test2.h5
+<-p u> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_055.txt b/tools/testfiles/h5diff_055.txt
new file mode 100644
index 0000000..941aeb7
--- /dev/null
+++ b/tools/testfiles/h5diff_055.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -p 0x1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p 0x1 h5diff_test1.h5 h5diff_test2.h5
+<-p 0x1> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_056.txt b/tools/testfiles/h5diff_056.txt
new file mode 100644
index 0000000..43dcaca
--- /dev/null
+++ b/tools/testfiles/h5diff_056.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -p 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p 1 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_057.txt b/tools/testfiles/h5diff_057.txt
new file mode 100644
index 0000000..f938c6c
--- /dev/null
+++ b/tools/testfiles/h5diff_057.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_058.txt b/tools/testfiles/h5diff_058.txt
new file mode 100644
index 0000000..0d29875
--- /dev/null
+++ b/tools/testfiles/h5diff_058.txt
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -p 7 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -p 7 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+0 differences found
+
diff --git a/tools/testfiles/h5diff_059.txt b/tools/testfiles/h5diff_059.txt
new file mode 100644
index 0000000..7f4c6de
--- /dev/null
+++ b/tools/testfiles/h5diff_059.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -p 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -p 1 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+4 differences found
+
diff --git a/tools/testfiles/h5diff_08.txt b/tools/testfiles/h5diff_061.txt
index cb94a5c..cb94a5c 100644
--- a/tools/testfiles/h5diff_08.txt
+++ b/tools/testfiles/h5diff_061.txt
diff --git a/tools/testfiles/h5diff_0610.txt b/tools/testfiles/h5diff_0610.txt
new file mode 100644
index 0000000..9474f5b
--- /dev/null
+++ b/tools/testfiles/h5diff_0610.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -n 2.3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -n 2.3 h5diff_test1.h5 h5diff_test2.h5
+<-n 2.3> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_062.txt b/tools/testfiles/h5diff_062.txt
new file mode 100644
index 0000000..cd17bf3
--- /dev/null
+++ b/tools/testfiles/h5diff_062.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -n -4 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -n -4 h5diff_test1.h5 h5diff_test2.h5
+-4 is an invalid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_09.txt b/tools/testfiles/h5diff_063.txt
index a743f16..a743f16 100644
--- a/tools/testfiles/h5diff_09.txt
+++ b/tools/testfiles/h5diff_063.txt
diff --git a/tools/testfiles/h5diff_064.txt b/tools/testfiles/h5diff_064.txt
new file mode 100644
index 0000000..5ec8067
--- /dev/null
+++ b/tools/testfiles/h5diff_064.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -n u h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -n u h5diff_test1.h5 h5diff_test2.h5
+<-n u> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_065.txt b/tools/testfiles/h5diff_065.txt
new file mode 100644
index 0000000..99f4f7d
--- /dev/null
+++ b/tools/testfiles/h5diff_065.txt
@@ -0,0 +1,18 @@
+#############################
+Expected output for 'h5diff -n 0x1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -n 0x1 h5diff_test1.h5 h5diff_test2.h5
+<-n 0x1> is not a valid option
+Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
+Items in [ ] are optional
+[obj1_name]       Name of an HDF5 object
+[obj2_name]       Name of an HDF5 object
+file1_name        File name of the first HDF5 file
+file2_name        File name of the second HDF5 file
+[OPTIONS] are:
+[-h ]             Print out this information
+[-l ]             List contents of file
+[-r ]             Print only what objects differ
+[-n count]        Print difference up to count number for each variable
+[-d delta]        Print difference when it is greater than limit delta
+[-p relative]     Print differences which are within a relative error value
diff --git a/tools/testfiles/h5diff_066.txt b/tools/testfiles/h5diff_066.txt
new file mode 100644
index 0000000..99afe18
--- /dev/null
+++ b/tools/testfiles/h5diff_066.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -n 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -n 1 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_067.txt b/tools/testfiles/h5diff_067.txt
new file mode 100644
index 0000000..98b6085
--- /dev/null
+++ b/tools/testfiles/h5diff_067.txt
@@ -0,0 +1,53 @@
+#############################
+Expected output for 'h5diff -n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff -n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5
+</compound> found in <h5diff_test1.h5> and </compound> found in <h5diff_test2.h5>
+</compound> and </compound> are of type H5G_TYPE
+</dset1.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.1> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.2> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.3> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.4> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.5> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.6> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.7> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.3.8> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset1.4> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.5> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.6> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset1.7> found in <h5diff_test1.h5> and </dset1.7> found in <h5diff_test2.h5>
+Comparing </dset1.7> with </dset1.7>
+Warning: </dset1.7> has different maximum dimensions than </dset1.7>
+</dset1.7>: [ 7 ]
+</dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
+Comparing </dset1.8> with </dset1.8>
+Warning: </dset1.8> has different storage datatype than </dset1.8>
+</dset1.8> has datatype H5T_STD_I32BE and </dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
+Comparing </dset1.9> with </dset1.9>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset2.1a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.1b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.2a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.2b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.3a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.3b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.4a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.4b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.5a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.5b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</dset2.6a> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+</dset2.6b> is in <h5diff_test2.h5>, but not in <h5diff_test1.h5>
+</enum> found in <h5diff_test1.h5> and </enum> found in <h5diff_test2.h5>
+</enum> and </enum> are of type H5G_TYPE
+</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
+</g1.1> and </g1.1> are of type H5G_GROUP
+</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_068.txt b/tools/testfiles/h5diff_068.txt
new file mode 100644
index 0000000..031ce8a
--- /dev/null
+++ b/tools/testfiles/h5diff_068.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -n 7 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -n 7 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+4 differences found
+
diff --git a/tools/testfiles/h5diff_069.txt b/tools/testfiles/h5diff_069.txt
new file mode 100644
index 0000000..c12bc41
--- /dev/null
+++ b/tools/testfiles/h5diff_069.txt
@@ -0,0 +1,11 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -n 1 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -n 1 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.1a> with <dset2.1b>
+using memory type H5T_NATIVE_SCHAR
+position        dset2.1a        dset2.1b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+1 differences found
+
diff --git a/tools/testfiles/h5diff_07.txt b/tools/testfiles/h5diff_07.txt
index 5e0198d..e297cb9 100644
--- a/tools/testfiles/h5diff_07.txt
+++ b/tools/testfiles/h5diff_07.txt
@@ -1,18 +1,5 @@
 #############################
-Expected output for 'h5diff -p -4 h5diff_test1.h5 h5diff_test2.h5'
+Expected output for 'h5diff h5diff_test1.h6 h5diff_test2.h6'
 #############################
-$h5diff -p -4 h5diff_test1.h5 h5diff_test2.h5
--4 is an invalid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name file2_name
-Items in [ ] are optional
-[obj1_name]       Name of an HDF5 object
-[obj2_name]       Name of an HDF5 object
-file1_name        File name of the first HDF5 file
-file2_name        File name of the second HDF5 file
-[OPTIONS] are:
-[-h ]             Print out this information
-[-l ]             List contents of file
-[-r ]             Print only what objects differ
-[-n count]        Print difference up to count number for each variable
-[-d delta]        Print difference when it is greater than limit delta
-[-p relative]     Print differences which are within a relative error value
+$h5diff h5diff_test1.h6 h5diff_test2.h6
+h5diff: h5diff_test1.h6: No such file or directory
diff --git a/tools/testfiles/h5diff_112.txt b/tools/testfiles/h5diff_112.txt
index e99d129..58ac8e4 100644
--- a/tools/testfiles/h5diff_112.txt
+++ b/tools/testfiles/h5diff_112.txt
@@ -1,6 +1,6 @@
 #############################
-Expected output for 'h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
+Expected output for 'h5diff dset1.1 soft h5diff_test1.h5 h5diff_test1.h5'
 #############################
-$h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
-<g1.1> and <g1.1> are of type H5G_GROUP
+$h5diff dset1.1 soft h5diff_test1.h5 h5diff_test1.h5
+<dset1.1> in <h5diff_test1.h5> is of different type than <soft> in <h5diff_test1.h5>
 
diff --git a/tools/testfiles/h5diff_113.txt b/tools/testfiles/h5diff_113.txt
new file mode 100644
index 0000000..8aa948e
--- /dev/null
+++ b/tools/testfiles/h5diff_113.txt
@@ -0,0 +1,6 @@
+#############################
+Expected output for 'h5diff dset1.1 compound h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.1 compound h5diff_test1.h5 h5diff_test1.h5
+<dset1.1> in <h5diff_test1.h5> is of different type than <compound> in <h5diff_test1.h5>
+
diff --git a/tools/testfiles/h5diff_121.txt b/tools/testfiles/h5diff_121.txt
index 92d21bd..e99d129 100644
--- a/tools/testfiles/h5diff_121.txt
+++ b/tools/testfiles/h5diff_121.txt
@@ -1,6 +1,6 @@
 #############################
-Expected output for 'h5diff compound h5diff_test1.h5 h5diff_test2.h5'
+Expected output for 'h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
-$h5diff compound h5diff_test1.h5 h5diff_test2.h5
-<compound> and <compound> are of type H5G_TYPE
+$h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
+<g1.1> and <g1.1> are of type H5G_GROUP
 
diff --git a/tools/testfiles/h5diff_122.txt b/tools/testfiles/h5diff_122.txt
index a5a2a03..92d21bd 100644
--- a/tools/testfiles/h5diff_122.txt
+++ b/tools/testfiles/h5diff_122.txt
@@ -1,6 +1,6 @@
 #############################
-Expected output for 'h5diff enum h5diff_test1.h5 h5diff_test2.h5'
+Expected output for 'h5diff compound h5diff_test1.h5 h5diff_test2.h5'
 #############################
-$h5diff enum h5diff_test1.h5 h5diff_test2.h5
-<enum> and <enum> are of type H5G_TYPE
+$h5diff compound h5diff_test1.h5 h5diff_test2.h5
+<compound> and <compound> are of type H5G_TYPE
 
diff --git a/tools/testfiles/h5diff_123.txt b/tools/testfiles/h5diff_123.txt
new file mode 100644
index 0000000..d84ee20
--- /dev/null
+++ b/tools/testfiles/h5diff_123.txt
@@ -0,0 +1,6 @@
+#############################
+Expected output for 'h5diff soft soft h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff soft soft h5diff_test1.h5 h5diff_test1.h5
+<soft> and <soft> are of type H5G_LINK
+
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
deleted file mode 100644
index 3aba2d2..0000000
--- a/tools/testfiles/h5diff_13.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff dset1.3 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$h5diff dset1.3 h5diff_test1.h5 h5diff_test2.h5
-Comparing <dset1.3> with <dset1.3>
-H5T_STRING comparison is not supported
-
diff --git a/tools/testfiles/h5diff_131.txt b/tools/testfiles/h5diff_131.txt
new file mode 100644
index 0000000..2a26b5d
--- /dev/null
+++ b/tools/testfiles/h5diff_131.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.1 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.1 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.1> with <dset1.3.1>
+H5T_STRING comparison is not supported
+
diff --git a/tools/testfiles/h5diff_132.txt b/tools/testfiles/h5diff_132.txt
new file mode 100644
index 0000000..c2817a4
--- /dev/null
+++ b/tools/testfiles/h5diff_132.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.2 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.2 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.2> with <dset1.3.2>
+H5T_BITFIELD comparison is not supported
+
diff --git a/tools/testfiles/h5diff_133.txt b/tools/testfiles/h5diff_133.txt
new file mode 100644
index 0000000..b1d5b1f
--- /dev/null
+++ b/tools/testfiles/h5diff_133.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.3 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.3 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.3> with <dset1.3.3>
+H5T_OPAQUE comparison is not supported
+
diff --git a/tools/testfiles/h5diff_134.txt b/tools/testfiles/h5diff_134.txt
new file mode 100644
index 0000000..ee59987
--- /dev/null
+++ b/tools/testfiles/h5diff_134.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.4 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.4 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.4> with <dset1.3.4>
+H5T_COMPOUND comparison is not supported
+
diff --git a/tools/testfiles/h5diff_135.txt b/tools/testfiles/h5diff_135.txt
new file mode 100644
index 0000000..eee81ae
--- /dev/null
+++ b/tools/testfiles/h5diff_135.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.5 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.5 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.5> with <dset1.3.5>
+H5T_REFERENCE comparison is not supported
+
diff --git a/tools/testfiles/h5diff_136.txt b/tools/testfiles/h5diff_136.txt
new file mode 100644
index 0000000..74fd6f8
--- /dev/null
+++ b/tools/testfiles/h5diff_136.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.6 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.6 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.6> with <dset1.3.6>
+H5T_ENUM comparison is not supported
+
diff --git a/tools/testfiles/h5diff_137.txt b/tools/testfiles/h5diff_137.txt
new file mode 100644
index 0000000..45bdb7a
--- /dev/null
+++ b/tools/testfiles/h5diff_137.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.7 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.7 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.7> with <dset1.3.7>
+H5T_VLEN comparison is not supported
+
diff --git a/tools/testfiles/h5diff_138.txt b/tools/testfiles/h5diff_138.txt
new file mode 100644
index 0000000..1fd3e21
--- /dev/null
+++ b/tools/testfiles/h5diff_138.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset1.3.8 h5diff_test1.h5 h5diff_test1.h5'
+#############################
+$h5diff dset1.3.8 h5diff_test1.h5 h5diff_test1.h5
+Comparing <dset1.3.8> with <dset1.3.8>
+H5T_ARRAY comparison is not supported
+
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index d5815bb..7295ef6 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -2,6 +2,10 @@
 Expected output for 'h5diff dset1.7 dset1.7 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff dset1.7 dset1.7 h5diff_test1.h5 h5diff_test2.h5
-Object <dset1.7> could not be found in <h5diff_test1.h5>
-Object <dset1.7> could not be found in <h5diff_test2.h5>
+Comparing <dset1.7> with <dset1.7>
+Warning: <dset1.7> has different maximum dimensions than <dset1.7>
+<dset1.7>: [ 7 ]
+<dset1.7>: [ 8 ]
+using memory type H5T_NATIVE_INT
+0 differences found
 
diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt
index c37d031..e6c625b 100644
--- a/tools/testfiles/h5diff_18.txt
+++ b/tools/testfiles/h5diff_18.txt
@@ -2,6 +2,9 @@
 Expected output for 'h5diff dset1.8 dset1.8 h5diff_test1.h5 h5diff_test2.h5'
 #############################
 $h5diff dset1.8 dset1.8 h5diff_test1.h5 h5diff_test2.h5
-Object <dset1.8> could not be found in <h5diff_test1.h5>
-Object <dset1.8> could not be found in <h5diff_test2.h5>
+Comparing <dset1.8> with <dset1.8>
+Warning: <dset1.8> has different storage datatype than <dset1.8>
+<dset1.8> has datatype H5T_STD_I32BE and <dset1.8> has datatype H5T_STD_I32LE
+using memory type H5T_NATIVE_INT
+0 differences found
 
diff --git a/tools/testfiles/h5diff_19.txt b/tools/testfiles/h5diff_19.txt
deleted file mode 100644
index ffb0391..0000000
--- a/tools/testfiles/h5diff_19.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff dset1.9 dset1.9 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$h5diff dset1.9 dset1.9 h5diff_test1.h5 h5diff_test2.h5
-Object <dset1.9> could not be found in <h5diff_test1.h5>
-Object <dset1.9> could not be found in <h5diff_test2.h5>
-
diff --git a/tools/testfiles/h5diff_test1.h5 b/tools/testfiles/h5diff_test1.h5
index ae44671..f4bb407 100644
--- a/tools/testfiles/h5diff_test1.h5
+++ b/tools/testfiles/h5diff_test1.h5
diff --git a/tools/testfiles/h5diff_test2.h5 b/tools/testfiles/h5diff_test2.h5
index 13f4b25..18a6648 100644
--- a/tools/testfiles/h5diff_test2.h5
+++ b/tools/testfiles/h5diff_test2.h5
diff --git a/tools/testfiles/h5diff_test3.h5 b/tools/testfiles/h5diff_test3.h5
index da36a12..3a08d67 100644
--- a/tools/testfiles/h5diff_test3.h5
+++ b/tools/testfiles/h5diff_test3.h5
diff --git a/tools/testfiles/h5diff_test4.h5 b/tools/testfiles/h5diff_test4.h5
index 6f242c4..702c421 100644
--- a/tools/testfiles/h5diff_test4.h5
+++ b/tools/testfiles/h5diff_test4.h5