[svn-r6695] Purpose:

test files

51 files changed, 346 insertions, 51 deletions

diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt
index 32e9f97..77266d9 100644
--- a/tools/testfiles/h5diff_01.txt
+++ b/tools/testfiles/h5diff_01.txt
@@ -1,9 +1,10 @@
 #############################
 Expected output for 'h5diff h5diff_test1.h5'
 #############################
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+$h5diff h5diff_test1.h5
+Number of arguments is only 2
+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
@@ -15,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_010.txt b/tools/testfiles/h5diff_010.txt
index edcf946..e297cb9 100644
--- a/tools/testfiles/h5diff_010.txt
+++ b/tools/testfiles/h5diff_010.txt
@@ -1,4 +1,5 @@
 #############################
 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_02.txt b/tools/testfiles/h5diff_02.txt
index bdf0add..84165ce 100644
--- a/tools/testfiles/h5diff_02.txt
+++ b/tools/testfiles/h5diff_02.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -x h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -x h5diff_test1.h5 h5diff_test2.h5
 -x is an invalid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_03.txt b/tools/testfiles/h5diff_03.txt
index 837a3bd..f8e44f0 100644
--- a/tools/testfiles/h5diff_03.txt
+++ b/tools/testfiles/h5diff_03.txt
@@ -1,9 +1,9 @@
 #############################
 Expected output for 'h5diff -h h5diff_test1.h5 h5diff_test2.h5'
 #############################
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+$h5diff -h h5diff_test1.h5 h5diff_test2.h5
+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
@@ -15,4 +15,3 @@ file2_name        File name of the second HDF5 file
 [-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_04.txt b/tools/testfiles/h5diff_04.txt
index c9b8680..4626647 100644
--- a/tools/testfiles/h5diff_04.txt
+++ b/tools/testfiles/h5diff_04.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -d h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -d h5diff_test1.h5 h5diff_test2.h5
 <-d h5diff_test1.h5> is not a valid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_05.txt b/tools/testfiles/h5diff_05.txt
index 8fdef45..3c35097 100644
--- a/tools/testfiles/h5diff_05.txt
+++ b/tools/testfiles/h5diff_05.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -d -4 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -d -4 h5diff_test1.h5 h5diff_test2.h5
 <-d -4> is not a valid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_06.txt b/tools/testfiles/h5diff_06.txt
index 9717060..732585b 100644
--- a/tools/testfiles/h5diff_06.txt
+++ b/tools/testfiles/h5diff_06.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -p h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -p h5diff_test1.h5 h5diff_test2.h5
 <-p h5diff_test1.h5> is not a valid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_07.txt b/tools/testfiles/h5diff_07.txt
index 5999f82..5e0198d 100644
--- a/tools/testfiles/h5diff_07.txt
+++ b/tools/testfiles/h5diff_07.txt
@@ -1,10 +1,10 @@
 #############################
 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]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_08.txt b/tools/testfiles/h5diff_08.txt
index e89db90..cb94a5c 100644
--- a/tools/testfiles/h5diff_08.txt
+++ b/tools/testfiles/h5diff_08.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -n h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -n h5diff_test1.h5 h5diff_test2.h5
 <-n h5diff_test1.h5> is not a valid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_09.txt
index 180009f..a743f16 100644
--- a/tools/testfiles/h5diff_09.txt
+++ b/tools/testfiles/h5diff_09.txt
@@ -1,10 +1,10 @@
 #############################
 Expected output for 'h5diff -n 0 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff -n 0 h5diff_test1.h5 h5diff_test2.h5
 <-n 0> is not a valid option
-Usage: h5diff [obj1_name] [obj2_name] [OPTIONS] file1_name [file2_name]
+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
@@ -16,4 +16,3 @@ file2_name        File name of the second HDF5 file
 [-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_111.txt b/tools/testfiles/h5diff_111.txt
index a31d0f6..6859581 100644
--- a/tools/testfiles/h5diff_111.txt
+++ b/tools/testfiles/h5diff_111.txt
@@ -1,4 +1,6 @@
 #############################
 Expected output for 'h5diff dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
-<dset1.1> is of different type than <g1.1>
+$h5diff dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
+<dset1.1> in <h5diff_test1.h5> is of different type than <g1.1> in <h5diff_test2.h5>
+
diff --git a/tools/testfiles/h5diff_112.txt b/tools/testfiles/h5diff_112.txt
index eb6a0a9..e99d129 100644
--- a/tools/testfiles/h5diff_112.txt
+++ b/tools/testfiles/h5diff_112.txt
@@ -1,4 +1,6 @@
 #############################
 Expected output for 'h5diff g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$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_121.txt b/tools/testfiles/h5diff_121.txt
index a21287d..92d21bd 100644
--- a/tools/testfiles/h5diff_121.txt
+++ b/tools/testfiles/h5diff_121.txt
@@ -1,4 +1,6 @@
 #############################
 Expected output for 'h5diff compound h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff compound h5diff_test1.h5 h5diff_test2.h5
 <compound> and <compound> are of type H5G_TYPE
+
diff --git a/tools/testfiles/h5diff_122.txt b/tools/testfiles/h5diff_122.txt
index c965e3a..a5a2a03 100644
--- a/tools/testfiles/h5diff_122.txt
+++ b/tools/testfiles/h5diff_122.txt
@@ -1,4 +1,6 @@
 #############################
 Expected output for 'h5diff enum h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff enum h5diff_test1.h5 h5diff_test2.h5
 <enum> and <enum> are of type H5G_TYPE
+
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index 6819d7d..3aba2d2 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -1,5 +1,7 @@
 #############################
 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_14.txt b/tools/testfiles/h5diff_14.txt
index cc4852b..34e2281 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/testfiles/h5diff_14.txt
@@ -1,5 +1,7 @@
 #############################
 Expected output for 'h5diff dset1.1 dset1.4 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff dset1.1 dset1.4 h5diff_test1.h5 h5diff_test2.h5
 Comparing <dset1.1> with <dset1.4>
 <dset1.1> is of class H5T_INTEGER and <dset1.4> is of class H5T_FLOAT
+
diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt
index 5b6be2a..4217bc2 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/testfiles/h5diff_15.txt
@@ -1,7 +1,9 @@
 #############################
 Expected output for 'h5diff dset1.1 dset1.5 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff dset1.1 dset1.5 h5diff_test1.h5 h5diff_test2.h5
 Comparing <dset1.1> with <dset1.5>
 <dset1.1> is of rank 1 and <dset1.5> is of rank 2
 <dset1.1>: [ 7 ]
 <dset1.5>: [ 3 ]
+
diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt
index f8984af..5986bc9 100644
--- a/tools/testfiles/h5diff_16.txt
+++ b/tools/testfiles/h5diff_16.txt
@@ -1,7 +1,9 @@
 #############################
 Expected output for 'h5diff dset1.1 dset1.6 h5diff_test1.h5 h5diff_test2.h5'
 #############################
+$h5diff dset1.1 dset1.6 h5diff_test1.h5 h5diff_test2.h5
 Comparing <dset1.1> with <dset1.6>
 <dset1.1> has different dimensions than <dset1.6>
 <dset1.1>: [ 7 ]
 <dset1.6>: [ 8 ]
+
diff --git a/tools/testfiles/h5diff_210.txt b/tools/testfiles/h5diff_210.txt
index 1cc017c..53b10f9 100644
--- a/tools/testfiles/h5diff_210.txt
+++ b/tools/testfiles/h5diff_210.txt
@@ -1,12 +1,6 @@
 #############################
 Expected output for 'h5diff dset2.1 dset2.2 h5diff_test1.h5 h5diff_test2.h5'
 #############################
-Comparing <dset2.1> with <dset2.2>
-using memory type H5T_NATIVE_SCHAR
-position        dset2.1         dset2.2         difference          
-------------------------------------------------------------
-[ 1 0 ]          1               3               2              
-[ 1 1 ]          1               4               3              
-[ 2 0 ]          1               5               4              
-[ 2 1 ]          1               6               5              
-4 differences found
+$h5diff dset2.1 dset2.2 h5diff_test1.h5 h5diff_test2.h5
+Cannot open dataset <dset2.1>
+
diff --git a/tools/testfiles/h5diff_211.txt b/tools/testfiles/h5diff_211.txt
index 3983cec..01e3d35 100644
--- a/tools/testfiles/h5diff_211.txt
+++ b/tools/testfiles/h5diff_211.txt
@@ -1,10 +1,6 @@
 #############################
 Expected output for 'h5diff dset2.1 dset2.2 -n 2 h5diff_test1.h5 h5diff_test2.h5'
 #############################
-Comparing <dset2.1> with <dset2.2>
-using memory type H5T_NATIVE_SCHAR
-position        dset2.1         dset2.2         difference          
-------------------------------------------------------------
-[ 1 0 ]          1               3               2              
-[ 1 1 ]          1               4               3              
-2 differences found
+$h5diff dset2.1 dset2.2 -n 2 h5diff_test1.h5 h5diff_test2.h5
+Cannot open dataset <dset2.1>
+
diff --git a/tools/testfiles/h5diff_212.txt b/tools/testfiles/h5diff_212.txt
index 5e3f258..977a270 100644
--- a/tools/testfiles/h5diff_212.txt
+++ b/tools/testfiles/h5diff_212.txt
@@ -1,10 +1,6 @@
 #############################
 Expected output for 'h5diff dset2.1 dset2.2 -d 3 h5diff_test1.h5 h5diff_test2.h5'
 #############################
-Comparing <dset2.1> with <dset2.2>
-using memory type H5T_NATIVE_SCHAR
-position        dset2.1         dset2.2         difference          
-------------------------------------------------------------
-[ 2 0 ]          1               5               4              
-[ 2 1 ]          1               6               5              
-2 differences found
+$h5diff dset2.1 dset2.2 -d 3 h5diff_test1.h5 h5diff_test2.h5
+Cannot open dataset <dset2.1>
+
diff --git a/tools/testfiles/h5diff_213.txt b/tools/testfiles/h5diff_213.txt
new file mode 100644
index 0000000..312ee87
--- /dev/null
+++ b/tools/testfiles/h5diff_213.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.1a dset2.1b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.1a dset2.1b -p 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          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_220.txt b/tools/testfiles/h5diff_220.txt
new file mode 100644
index 0000000..688fcee
--- /dev/null
+++ b/tools/testfiles/h5diff_220.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.2a dset2.2b h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.2a dset2.2b h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.2a> with <dset2.2b>
+using memory type H5T_NATIVE_SHORT
+position        dset2.2a        dset2.2b        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_221.txt b/tools/testfiles/h5diff_221.txt
new file mode 100644
index 0000000..9ca4b5c
--- /dev/null
+++ b/tools/testfiles/h5diff_221.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.2a dset2.2b -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.2a dset2.2b -n 2 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.2a> with <dset2.2b>
+using memory type H5T_NATIVE_SHORT
+position        dset2.2a        dset2.2b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_222.txt b/tools/testfiles/h5diff_222.txt
new file mode 100644
index 0000000..91992c8
--- /dev/null
+++ b/tools/testfiles/h5diff_222.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.2a dset2.2b -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.2a dset2.2b -d 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.2a> with <dset2.2b>
+using memory type H5T_NATIVE_SHORT
+position        dset2.2a        dset2.2b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_223.txt b/tools/testfiles/h5diff_223.txt
new file mode 100644
index 0000000..17514f4
--- /dev/null
+++ b/tools/testfiles/h5diff_223.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.2a dset2.2b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.2a dset2.2b -p 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.2a> with <dset2.2b>
+using memory type H5T_NATIVE_SHORT
+position        dset2.2a        dset2.2b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_230.txt b/tools/testfiles/h5diff_230.txt
new file mode 100644
index 0000000..bdfc40e
--- /dev/null
+++ b/tools/testfiles/h5diff_230.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.3a dset2.3b h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.3a dset2.3b h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.3a> with <dset2.3b>
+using memory type H5T_NATIVE_INT
+position        dset2.3a        dset2.3b        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_231.txt b/tools/testfiles/h5diff_231.txt
new file mode 100644
index 0000000..5bc4a08
--- /dev/null
+++ b/tools/testfiles/h5diff_231.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.3a dset2.3b -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.3a dset2.3b -n 2 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.3a> with <dset2.3b>
+using memory type H5T_NATIVE_INT
+position        dset2.3a        dset2.3b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_232.txt b/tools/testfiles/h5diff_232.txt
new file mode 100644
index 0000000..c6222c4
--- /dev/null
+++ b/tools/testfiles/h5diff_232.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.3a dset2.3b -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.3a dset2.3b -d 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.3a> with <dset2.3b>
+using memory type H5T_NATIVE_INT
+position        dset2.3a        dset2.3b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_233.txt b/tools/testfiles/h5diff_233.txt
new file mode 100644
index 0000000..e580cb5
--- /dev/null
+++ b/tools/testfiles/h5diff_233.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.3a dset2.3b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.3a dset2.3b -p 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.3a> with <dset2.3b>
+using memory type H5T_NATIVE_INT
+position        dset2.3a        dset2.3b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_240.txt b/tools/testfiles/h5diff_240.txt
new file mode 100644
index 0000000..c86aee7
--- /dev/null
+++ b/tools/testfiles/h5diff_240.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.4a dset2.4b h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.4a dset2.4b h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.4a> with <dset2.4b>
+using memory type H5T_NATIVE_INT
+position        dset2.4a        dset2.4b        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_241.txt b/tools/testfiles/h5diff_241.txt
new file mode 100644
index 0000000..f95fb81
--- /dev/null
+++ b/tools/testfiles/h5diff_241.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.4a dset2.4b -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.4a dset2.4b -n 2 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.4a> with <dset2.4b>
+using memory type H5T_NATIVE_INT
+position        dset2.4a        dset2.4b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_242.txt b/tools/testfiles/h5diff_242.txt
new file mode 100644
index 0000000..32da751
--- /dev/null
+++ b/tools/testfiles/h5diff_242.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.4a dset2.4b -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.4a dset2.4b -d 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.4a> with <dset2.4b>
+using memory type H5T_NATIVE_INT
+position        dset2.4a        dset2.4b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_243.txt b/tools/testfiles/h5diff_243.txt
new file mode 100644
index 0000000..03a583d
--- /dev/null
+++ b/tools/testfiles/h5diff_243.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.4a dset2.4b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.4a dset2.4b -p 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.4a> with <dset2.4b>
+using memory type H5T_NATIVE_INT
+position        dset2.4a        dset2.4b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_250.txt b/tools/testfiles/h5diff_250.txt
new file mode 100644
index 0000000..67efcac
--- /dev/null
+++ b/tools/testfiles/h5diff_250.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.5a dset2.5b h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.5a dset2.5b h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.5a> with <dset2.5b>
+using memory type H5T_NATIVE_FLOAT
+position        dset2.5a        dset2.5b        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_251.txt b/tools/testfiles/h5diff_251.txt
new file mode 100644
index 0000000..35a75ed
--- /dev/null
+++ b/tools/testfiles/h5diff_251.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.5a dset2.5b -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.5a dset2.5b -n 2 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.5a> with <dset2.5b>
+using memory type H5T_NATIVE_FLOAT
+position        dset2.5a        dset2.5b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_252.txt b/tools/testfiles/h5diff_252.txt
new file mode 100644
index 0000000..2fd68b2
--- /dev/null
+++ b/tools/testfiles/h5diff_252.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.5a dset2.5b -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.5a dset2.5b -d 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.5a> with <dset2.5b>
+using memory type H5T_NATIVE_FLOAT
+position        dset2.5a        dset2.5b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_253.txt b/tools/testfiles/h5diff_253.txt
new file mode 100644
index 0000000..6893d67
--- /dev/null
+++ b/tools/testfiles/h5diff_253.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.5a dset2.5b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.5a dset2.5b -p 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.5a> with <dset2.5b>
+using memory type H5T_NATIVE_FLOAT
+position        dset2.5a        dset2.5b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_260.txt b/tools/testfiles/h5diff_260.txt
new file mode 100644
index 0000000..f8bfb34
--- /dev/null
+++ b/tools/testfiles/h5diff_260.txt
@@ -0,0 +1,14 @@
+#############################
+Expected output for 'h5diff dset2.6a dset2.6b h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.6a dset2.6b h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.6a> with <dset2.6b>
+using memory type H5T_NATIVE_DOUBLE
+position        dset2.6a        dset2.6b        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_261.txt b/tools/testfiles/h5diff_261.txt
new file mode 100644
index 0000000..6102ff3
--- /dev/null
+++ b/tools/testfiles/h5diff_261.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.6a dset2.6b -n 2 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.6a dset2.6b -n 2 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.6a> with <dset2.6b>
+using memory type H5T_NATIVE_DOUBLE
+position        dset2.6a        dset2.6b        difference          
+------------------------------------------------------------
+[ 1 0 ]          1               3               2              
+[ 1 1 ]          1               4               3              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_262.txt b/tools/testfiles/h5diff_262.txt
new file mode 100644
index 0000000..fc4b159
--- /dev/null
+++ b/tools/testfiles/h5diff_262.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.6a dset2.6b -d 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.6a dset2.6b -d 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.6a> with <dset2.6b>
+using memory type H5T_NATIVE_DOUBLE
+position        dset2.6a        dset2.6b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_263.txt b/tools/testfiles/h5diff_263.txt
new file mode 100644
index 0000000..7df596d
--- /dev/null
+++ b/tools/testfiles/h5diff_263.txt
@@ -0,0 +1,12 @@
+#############################
+Expected output for 'h5diff dset2.6a dset2.6b -p 3 h5diff_test1.h5 h5diff_test2.h5'
+#############################
+$h5diff dset2.6a dset2.6b -p 3 h5diff_test1.h5 h5diff_test2.h5
+Comparing <dset2.6a> with <dset2.6b>
+using memory type H5T_NATIVE_DOUBLE
+position        dset2.6a        dset2.6b        difference          
+------------------------------------------------------------
+[ 2 0 ]          1               5               4              
+[ 2 1 ]          1               6               5              
+2 differences found
+
diff --git a/tools/testfiles/h5diff_30.txt b/tools/testfiles/h5diff_30.txt
new file mode 100644
index 0000000..1dfec59
--- /dev/null
+++ b/tools/testfiles/h5diff_30.txt
@@ -0,0 +1,11 @@
+#############################
+Expected output for 'h5diff h5diff_test3.h5 h5diff_test4.h5'
+#############################
+$h5diff h5diff_test3.h5 h5diff_test4.h5
+</dset3> found in <h5diff_test3.h5> and </dset3> found in <h5diff_test4.h5>
+Comparing </dset3> with </dset3>
+using memory type H5T_NATIVE_INT
+0 differences found
+</dset4> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
+</dset5> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
+
diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt
new file mode 100644
index 0000000..a4d73d7
--- /dev/null
+++ b/tools/testfiles/h5diff_31.txt
@@ -0,0 +1,8 @@
+#############################
+Expected output for 'h5diff dset3 dset3 h5diff_test3.h5 h5diff_test4.h5'
+#############################
+$h5diff dset3 dset3 h5diff_test3.h5 h5diff_test4.h5
+Comparing <dset3> with <dset3>
+using memory type H5T_NATIVE_INT
+0 differences found
+
diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt
new file mode 100644
index 0000000..cedce16
--- /dev/null
+++ b/tools/testfiles/h5diff_32.txt
@@ -0,0 +1,6 @@
+#############################
+Expected output for 'h5diff dset3 dset4 h5diff_test3.h5 h5diff_test4.h5'
+#############################
+$h5diff dset3 dset4 h5diff_test3.h5 h5diff_test4.h5
+Object <dset4> could not be found in <h5diff_test4.h5>
+
diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt
new file mode 100644
index 0000000..94587ae
--- /dev/null
+++ b/tools/testfiles/h5diff_33.txt
@@ -0,0 +1,6 @@
+#############################
+Expected output for 'h5diff dset6 dset3 h5diff_test3.h5 h5diff_test4.h5'
+#############################
+$h5diff dset6 dset3 h5diff_test3.h5 h5diff_test4.h5
+Object <dset6> could not be found in <h5diff_test3.h5>
+
diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt
new file mode 100644
index 0000000..704896b
--- /dev/null
+++ b/tools/testfiles/h5diff_34.txt
@@ -0,0 +1,7 @@
+#############################
+Expected output for 'h5diff dset6 dset6 h5diff_test3.h5 h5diff_test4.h5'
+#############################
+$h5diff dset6 dset6 h5diff_test3.h5 h5diff_test4.h5
+Object <dset6> could not be found in <h5diff_test3.h5>
+Object <dset6> could not be found in <h5diff_test4.h5>
+
diff --git a/tools/testfiles/h5diff_test1.h5 b/tools/testfiles/h5diff_test1.h5
index fca98d8..ae44671 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 ec934b1..13f4b25 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
new file mode 100644
index 0000000..da36a12
--- /dev/null
+++ b/tools/testfiles/h5diff_test3.h5
diff --git a/tools/testfiles/h5diff_test4.h5 b/tools/testfiles/h5diff_test4.h5
new file mode 100644
index 0000000..6f242c4
--- /dev/null
+++ b/tools/testfiles/h5diff_test4.h5