[svn-r6893] Purpose:

removed test files before last output change

Description:

Solution:

Platforms tested:

Misc. update:

96 files changed, 0 insertions, 1164 deletions

diff --git a/tools/testfiles/h5diff_01.txt b/tools/testfiles/h5diff_01.txt
deleted file mode 100644
index 919a6f1..0000000
--- a/tools/testfiles/h5diff_01.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_test1.h5'
-#############################
-$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
-file2_name        File name of the second HDF5 file
-[OPTIONS] are:
-[-h ]             Print out this information
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_02.txt b/tools/testfiles/h5diff_02.txt
deleted file mode 100644
index 738c8b9..0000000
--- a/tools/testfiles/h5diff_02.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_031.txt b/tools/testfiles/h5diff_031.txt
deleted file mode 100644
index 348bfbb..0000000
--- a/tools/testfiles/h5diff_031.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#############################
-Expected output for 'h5diff -h h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$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
-file2_name        File name of the second HDF5 file
-[OPTIONS] are:
-[-h ]             Print out this information
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_033.txt b/tools/testfiles/h5diff_033.txt
deleted file mode 100644
index a5d4121..0000000
--- a/tools/testfiles/h5diff_033.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</soft> is in <h5diff_test1.h5>, but not in <h5diff_test2.h5>
-
diff --git a/tools/testfiles/h5diff_041.txt b/tools/testfiles/h5diff_041.txt
deleted file mode 100644
index 2e0203e..0000000
--- a/tools/testfiles/h5diff_041.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_0410.txt b/tools/testfiles/h5diff_0410.txt
deleted file mode 100644
index aa828f3..0000000
--- a/tools/testfiles/h5diff_0410.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#############################
-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>
-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_042.txt b/tools/testfiles/h5diff_042.txt
deleted file mode 100644
index 8e9fa42..0000000
--- a/tools/testfiles/h5diff_042.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_043.txt b/tools/testfiles/h5diff_043.txt
deleted file mode 100644
index 59ab375..0000000
--- a/tools/testfiles/h5diff_043.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_044.txt b/tools/testfiles/h5diff_044.txt
deleted file mode 100644
index 0ac488b..0000000
--- a/tools/testfiles/h5diff_044.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_045.txt b/tools/testfiles/h5diff_045.txt
deleted file mode 100644
index 1452776..0000000
--- a/tools/testfiles/h5diff_045.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_046.txt b/tools/testfiles/h5diff_046.txt
deleted file mode 100644
index 8dac2c5..0000000
--- a/tools/testfiles/h5diff_046.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index edf2d7c..0000000
--- a/tools/testfiles/h5diff_047.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index 4d656db..0000000
--- a/tools/testfiles/h5diff_048.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_049.txt b/tools/testfiles/h5diff_049.txt
deleted file mode 100644
index 02f729f..0000000
--- a/tools/testfiles/h5diff_049.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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_051.txt b/tools/testfiles/h5diff_051.txt
deleted file mode 100644
index 2c7ee52..0000000
--- a/tools/testfiles/h5diff_051.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_0510.txt b/tools/testfiles/h5diff_0510.txt
deleted file mode 100644
index 26ca338..0000000
--- a/tools/testfiles/h5diff_0510.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 98e6f66..0000000
--- a/tools/testfiles/h5diff_052.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_053.txt b/tools/testfiles/h5diff_053.txt
deleted file mode 100644
index 07b10f6..0000000
--- a/tools/testfiles/h5diff_053.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_054.txt b/tools/testfiles/h5diff_054.txt
deleted file mode 100644
index 44ef2c1..0000000
--- a/tools/testfiles/h5diff_054.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_055.txt b/tools/testfiles/h5diff_055.txt
deleted file mode 100644
index 6ba293f..0000000
--- a/tools/testfiles/h5diff_055.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_056.txt b/tools/testfiles/h5diff_056.txt
deleted file mode 100644
index 783a738..0000000
--- a/tools/testfiles/h5diff_056.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index e5ef529..0000000
--- a/tools/testfiles/h5diff_057.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index be2dc79..0000000
--- a/tools/testfiles/h5diff_058.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_059.txt b/tools/testfiles/h5diff_059.txt
deleted file mode 100644
index 2117daf..0000000
--- a/tools/testfiles/h5diff_059.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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_061.txt b/tools/testfiles/h5diff_061.txt
deleted file mode 100644
index 30d5fc0..0000000
--- a/tools/testfiles/h5diff_061.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_0610.txt b/tools/testfiles/h5diff_0610.txt
deleted file mode 100644
index 0cde0ff..0000000
--- a/tools/testfiles/h5diff_0610.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_062.txt b/tools/testfiles/h5diff_062.txt
deleted file mode 100644
index 30b7af7..0000000
--- a/tools/testfiles/h5diff_062.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_063.txt b/tools/testfiles/h5diff_063.txt
deleted file mode 100644
index cbeb3ae..0000000
--- a/tools/testfiles/h5diff_063.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_064.txt b/tools/testfiles/h5diff_064.txt
deleted file mode 100644
index 22bf824..0000000
--- a/tools/testfiles/h5diff_064.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_065.txt b/tools/testfiles/h5diff_065.txt
deleted file mode 100644
index b9d01d1..0000000
--- a/tools/testfiles/h5diff_065.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#############################
-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
-[-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
-[-m ]             Print differences on a sequential match iteration
diff --git a/tools/testfiles/h5diff_066.txt b/tools/testfiles/h5diff_066.txt
deleted file mode 100644
index 7fdf701..0000000
--- a/tools/testfiles/h5diff_066.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index 634e511..0000000
--- a/tools/testfiles/h5diff_067.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################
-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>
-</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>
-</dset1.8> found in <h5diff_test1.h5> and </dset1.8> found in <h5diff_test2.h5>
-</dset1.9> found in <h5diff_test1.h5> and </dset1.9> found in <h5diff_test2.h5>
-</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>
-</g1.1> found in <h5diff_test1.h5> and </g1.1> found in <h5diff_test2.h5>
-</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
deleted file mode 100644
index 5066e46..0000000
--- a/tools/testfiles/h5diff_068.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 2e8c61d..0000000
--- a/tools/testfiles/h5diff_069.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index e297cb9..0000000
--- a/tools/testfiles/h5diff_07.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_111.txt b/tools/testfiles/h5diff_111.txt
deleted file mode 100644
index 6859581..0000000
--- a/tools/testfiles/h5diff_111.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$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
deleted file mode 100644
index 58ac8e4..0000000
--- a/tools/testfiles/h5diff_112.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset1.1 soft h5diff_test1.h5 h5diff_test1.h5'
-#############################
-$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
deleted file mode 100644
index 8aa948e..0000000
--- a/tools/testfiles/h5diff_113.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-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
deleted file mode 100644
index e99d129..0000000
--- a/tools/testfiles/h5diff_121.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-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_122.txt b/tools/testfiles/h5diff_122.txt
deleted file mode 100644
index 92d21bd..0000000
--- a/tools/testfiles/h5diff_122.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-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_123.txt b/tools/testfiles/h5diff_123.txt
deleted file mode 100644
index d84ee20..0000000
--- a/tools/testfiles/h5diff_123.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-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_131.txt b/tools/testfiles/h5diff_131.txt
deleted file mode 100644
index 2a26b5d..0000000
--- a/tools/testfiles/h5diff_131.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index c2817a4..0000000
--- a/tools/testfiles/h5diff_132.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index b1d5b1f..0000000
--- a/tools/testfiles/h5diff_133.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index ee59987..0000000
--- a/tools/testfiles/h5diff_134.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index eee81ae..0000000
--- a/tools/testfiles/h5diff_135.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index 74fd6f8..0000000
--- a/tools/testfiles/h5diff_136.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index 45bdb7a..0000000
--- a/tools/testfiles/h5diff_137.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index 1fd3e21..0000000
--- a/tools/testfiles/h5diff_138.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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_14.txt b/tools/testfiles/h5diff_14.txt
deleted file mode 100644
index 34e2281..0000000
--- a/tools/testfiles/h5diff_14.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-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
deleted file mode 100644
index 4217bc2..0000000
--- a/tools/testfiles/h5diff_15.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#############################
-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
deleted file mode 100644
index 7d2452a..0000000
--- a/tools/testfiles/h5diff_16.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-#############################
-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>
-Warning: <dset1.1> has different maximum dimensions than <dset1.6>
-<dset1.1>: [ 7 ]
-<dset1.6>: [ 8 ]
-<dset1.1> has different dimensions than <dset1.6>
-<dset1.1>: [ 7 ]
-<dset1.6>: [ 8 ]
-
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
deleted file mode 100644
index 301ebb6..0000000
--- a/tools/testfiles/h5diff_17.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-#############################
-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
-Comparing <dset1.7> with <dset1.7>
-Warning: <dset1.7> has different maximum dimensions than <dset1.7>
-<dset1.7>: [ 7 ]
-<dset1.7>: [ 8 ]
-0 differences found
-
diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt
deleted file mode 100644
index d5f583a..0000000
--- a/tools/testfiles/h5diff_18.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#############################
-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
-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
-0 differences found
-
diff --git a/tools/testfiles/h5diff_210.txt b/tools/testfiles/h5diff_210.txt
deleted file mode 100644
index 53b10f9..0000000
--- a/tools/testfiles/h5diff_210.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset2.1 dset2.2 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$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
deleted file mode 100644
index 01e3d35..0000000
--- a/tools/testfiles/h5diff_211.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset2.1 dset2.2 -n 2 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$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
deleted file mode 100644
index 977a270..0000000
--- a/tools/testfiles/h5diff_212.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset2.1 dset2.2 -d 3 h5diff_test1.h5 h5diff_test2.h5'
-#############################
-$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
deleted file mode 100644
index ae8dc09..0000000
--- a/tools/testfiles/h5diff_213.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 7ceddec..0000000
--- a/tools/testfiles/h5diff_220.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index e1a569c..0000000
--- a/tools/testfiles/h5diff_221.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index cd16fb1..0000000
--- a/tools/testfiles/h5diff_222.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index d25e995..0000000
--- a/tools/testfiles/h5diff_223.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index ba72590..0000000
--- a/tools/testfiles/h5diff_230.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index e6684f3..0000000
--- a/tools/testfiles/h5diff_231.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index c3474ea..0000000
--- a/tools/testfiles/h5diff_232.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 89ee3d9..0000000
--- a/tools/testfiles/h5diff_233.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index db12b4b..0000000
--- a/tools/testfiles/h5diff_240.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 4d21e96..0000000
--- a/tools/testfiles/h5diff_241.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 42da6c5..0000000
--- a/tools/testfiles/h5diff_242.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 9fc2f6c..0000000
--- a/tools/testfiles/h5diff_243.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 16eda07..0000000
--- a/tools/testfiles/h5diff_250.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 6e26192..0000000
--- a/tools/testfiles/h5diff_251.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 7d76fc2..0000000
--- a/tools/testfiles/h5diff_252.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 6a1255f..0000000
--- a/tools/testfiles/h5diff_253.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index ecb10a0..0000000
--- a/tools/testfiles/h5diff_260.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index d06ab90..0000000
--- a/tools/testfiles/h5diff_261.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index ba8ad24..0000000
--- a/tools/testfiles/h5diff_262.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 0449655..0000000
--- a/tools/testfiles/h5diff_263.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-#############################
-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>
-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
deleted file mode 100644
index 9855851..0000000
--- a/tools/testfiles/h5diff_30.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_test3.h5 h5diff_test4.h5'
-#############################
-$h5diff h5diff_test3.h5 h5diff_test4.h5
-</dset_A> found in <h5diff_test3.h5> and </dset_A> found in <h5diff_test4.h5>
-</dset_B> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
-</dset_C> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5>
-
diff --git a/tools/testfiles/h5diff_31.txt b/tools/testfiles/h5diff_31.txt
deleted file mode 100644
index 5b2d5a6..0000000
--- a/tools/testfiles/h5diff_31.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff dset_A dset_A h5diff_test3.h5 h5diff_test4.h5'
-#############################
-$h5diff dset_A dset_A h5diff_test3.h5 h5diff_test4.h5
-Comparing <dset_A> with <dset_A>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_32.txt b/tools/testfiles/h5diff_32.txt
deleted file mode 100644
index 1bea572..0000000
--- a/tools/testfiles/h5diff_32.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset_A dset_B h5diff_test3.h5 h5diff_test4.h5'
-#############################
-$h5diff dset_A dset_B h5diff_test3.h5 h5diff_test4.h5
-Object <dset_B> could not be found in <h5diff_test4.h5>
-
diff --git a/tools/testfiles/h5diff_33.txt b/tools/testfiles/h5diff_33.txt
deleted file mode 100644
index fd247ad..0000000
--- a/tools/testfiles/h5diff_33.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset_C dset_A h5diff_test3.h5 h5diff_test4.h5'
-#############################
-$h5diff dset_C dset_A h5diff_test3.h5 h5diff_test4.h5
-Object <dset_C> could not be found in <h5diff_test3.h5>
-
diff --git a/tools/testfiles/h5diff_34.txt b/tools/testfiles/h5diff_34.txt
deleted file mode 100644
index 84c1db6..0000000
--- a/tools/testfiles/h5diff_34.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff dset_C dset_C h5diff_test3.h5 h5diff_test4.h5'
-#############################
-$h5diff dset_C dset_C h5diff_test3.h5 h5diff_test4.h5
-Object <dset_C> could not be found in <h5diff_test3.h5>
-
diff --git a/tools/testfiles/h5diff_35.txt b/tools/testfiles/h5diff_35.txt
deleted file mode 100644
index 38f3b01..0000000
--- a/tools/testfiles/h5diff_35.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_test4.h5 h5diff_test3.h5'
-#############################
-$h5diff h5diff_test4.h5 h5diff_test3.h5
-</dset_A> found in <h5diff_test4.h5> and </dset_A> found in <h5diff_test3.h5>
-</dset_B> is in <h5diff_test3.h5>, but not in <h5diff_test4.h5>
-</dset_C> is in <h5diff_test4.h5>, but not in <h5diff_test3.h5>
-
diff --git a/tools/testfiles/h5diff_40.txt b/tools/testfiles/h5diff_40.txt
deleted file mode 100644
index cc4be28..0000000
--- a/tools/testfiles/h5diff_40.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff g1/dset1 g2/dset1 h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff g1/dset1 g2/dset1 h5diff_test5.h5 h5diff_test6.h5
-Comparing <g1/dset1> with <g2/dset1>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_411.txt b/tools/testfiles/h5diff_411.txt
deleted file mode 100644
index 9b214d4..0000000
--- a/tools/testfiles/h5diff_411.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff dset1 dset1 h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff dset1 dset1 h5diff_test5.h5 h5diff_test6.h5
-Object <dset1> could not be found in <h5diff_test5.h5>
-Object <dset1> could not be found in <h5diff_test6.h5>
-
diff --git a/tools/testfiles/h5diff_412.txt b/tools/testfiles/h5diff_412.txt
deleted file mode 100644
index 09a1d62..0000000
--- a/tools/testfiles/h5diff_412.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff /g1/dset1 dset1 h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff /g1/dset1 dset1 h5diff_test5.h5 h5diff_test6.h5
-Object <dset1> could not be found in <h5diff_test6.h5>
-
diff --git a/tools/testfiles/h5diff_413.txt b/tools/testfiles/h5diff_413.txt
deleted file mode 100644
index cccdf93..0000000
--- a/tools/testfiles/h5diff_413.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#############################
-Expected output for 'h5diff /g1/dset1 /g1/dset1 h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff /g1/dset1 /g1/dset1 h5diff_test5.h5 h5diff_test6.h5
-Object </g1/dset1> could not be found in <h5diff_test6.h5>
-
diff --git a/tools/testfiles/h5diff_421.txt b/tools/testfiles/h5diff_421.txt
deleted file mode 100644
index 94a4258..0000000
--- a/tools/testfiles/h5diff_421.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff /a/b/c /a/b/c h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff /a/b/c /a/b/c h5diff_test5.h5 h5diff_test6.h5
-Comparing </a/b/c> with </a/b/c>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_422.txt b/tools/testfiles/h5diff_422.txt
deleted file mode 100644
index 9b99466..0000000
--- a/tools/testfiles/h5diff_422.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-#############################
-Expected output for 'h5diff /x/a/c /a/b/c h5diff_test5.h5 h5diff_test6.h5'
-#############################
-$h5diff /x/a/c /a/b/c h5diff_test5.h5 h5diff_test6.h5
-Comparing </x/a/c> with </a/b/c>
-0 differences found
-
diff --git a/tools/testfiles/h5diff_test1.h5 b/tools/testfiles/h5diff_test1.h5
deleted file mode 100644
index e5b1281..0000000
--- a/tools/testfiles/h5diff_test1.h5
+++ /dev/null
diff --git a/tools/testfiles/h5diff_test2.h5 b/tools/testfiles/h5diff_test2.h5
deleted file mode 100644
index 30d05bd..0000000
--- a/tools/testfiles/h5diff_test2.h5
+++ /dev/null
diff --git a/tools/testfiles/h5diff_test3.h5 b/tools/testfiles/h5diff_test3.h5
deleted file mode 100644
index ffeff7f..0000000
--- a/tools/testfiles/h5diff_test3.h5
+++ /dev/null
diff --git a/tools/testfiles/h5diff_test4.h5 b/tools/testfiles/h5diff_test4.h5
deleted file mode 100644
index 5777c98..0000000
--- a/tools/testfiles/h5diff_test4.h5
+++ /dev/null
diff --git a/tools/testfiles/h5diff_test5.h5 b/tools/testfiles/h5diff_test5.h5
deleted file mode 100644
index 74cfb19..0000000
--- a/tools/testfiles/h5diff_test5.h5
+++ /dev/null
diff --git a/tools/testfiles/h5diff_test6.h5 b/tools/testfiles/h5diff_test6.h5
deleted file mode 100644
index de0ec0f..0000000
--- a/tools/testfiles/h5diff_test6.h5
+++ /dev/null