[svn-r15745] Move h5diff testfiles to /tools/h5diff/testfiles

Tested: linux

99 files changed, 140 insertions, 462 deletions

diff --git a/tools/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index a96e00c..8877a75 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -h'
-#############################
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
   file2                    File name of the second HDF5 file
diff --git a/tools/testfiles/h5diff_100.txt b/tools/h5diff/testfiles/h5diff_100.txt
index 82b42ce..32ff7ab 100644
--- a/tools/testfiles/h5diff_100.txt
+++ b/tools/h5diff/testfiles/h5diff_100.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_hyper1.h5 h5diff_hyper2.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt
index 7affe59..03875b7 100644
--- a/tools/testfiles/h5diff_101.txt
+++ b/tools/h5diff/testfiles/h5diff_101.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/d1 g1/d2'
-#############################
 dataset: </g1/d1> and </g1/d2>
 size:           [3x2]           [3x2]
 position        d1              d2              difference          
diff --git a/tools/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt
index dba340b..3d91a36 100644
--- a/tools/testfiles/h5diff_102.txt
+++ b/tools/h5diff/testfiles/h5diff_102.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic1.h5 g1/fp1 g1/fp2'
-#############################
 dataset: </g1/fp1> and </g1/fp2>
 size:           [3x2]           [3x2]
 position        fp1             fp2             difference          
diff --git a/tools/h5diff/testfiles/h5diff_11.txt b/tools/h5diff/testfiles/h5diff_11.txt
new file mode 100644
index 0000000..e2e33fb
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_11.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset1> and </g1/dset1>
+5 differences found
diff --git a/tools/h5diff/testfiles/h5diff_12.txt b/tools/h5diff/testfiles/h5diff_12.txt
new file mode 100644
index 0000000..6b4c747
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_12.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset1> and </g1/dset2>
+5 differences found
diff --git a/tools/testfiles/h5diff_13.txt b/tools/h5diff/testfiles/h5diff_13.txt
index 834f809..36676e9 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/h5diff/testfiles/h5diff_13.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
 dataset: </g1/dset1> and </g1/dset1>
 size:           [3x2]           [3x2]
 position        dset1           dset1           difference          
diff --git a/tools/testfiles/h5diff_14.txt b/tools/h5diff/testfiles/h5diff_14.txt
index d0f75b5..3fac3af 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/h5diff/testfiles/h5diff_14.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -r h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2'
-#############################
 dataset: </g1/dset1> and </g1/dset2>
 size:           [3x2]           [3x2]
 position        dset1           dset2           difference          
diff --git a/tools/testfiles/h5diff_15.txt b/tools/h5diff/testfiles/h5diff_15.txt
index 529ffc5..386c6e1 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/h5diff/testfiles/h5diff_15.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff --report --delta=5 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 dataset: </g1/dset3> and </g1/dset4>
 size:           [3x2]           [3x2]
 position        dset3           dset4           difference          
diff --git a/tools/testfiles/h5diff_16_1.txt b/tools/h5diff/testfiles/h5diff_16_1.txt
index 738a0f7..6155ebf 100644
--- a/tools/testfiles/h5diff_16_1.txt
+++ b/tools/h5diff/testfiles/h5diff_16_1.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset5 g1/dset6'
-#############################
 dataset: </g1/dset5> and </g1/dset6>
 size:           [3x2]           [3x2]
 position        dset5           dset6           difference      relative       
diff --git a/tools/testfiles/h5diff_16_2.txt b/tools/h5diff/testfiles/h5diff_16_2.txt
index 421bf70..43127bb 100644
--- a/tools/testfiles/h5diff_16_2.txt
+++ b/tools/h5diff/testfiles/h5diff_16_2.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff --verbose --relative=0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset7 g1/dset8'
-#############################
 dataset: </g1/dset7> and </g1/dset8>
 size:           [3x2]           [3x2]
 position        dset7           dset8           difference      relative       
diff --git a/tools/testfiles/h5diff_16_3.txt b/tools/h5diff/testfiles/h5diff_16_3.txt
index 0721799..6da24cf 100644
--- a/tools/testfiles/h5diff_16_3.txt
+++ b/tools/h5diff/testfiles/h5diff_16_3.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v -p 0.02 h5diff_basic1.h5 h5diff_basic1.h5 g1/dset9 g1/dset10'
-#############################
 dataset: </g1/dset9> and </g1/dset10>
 size:           [3x2]           [3x2]
 position        dset9           dset10          difference      relative       
diff --git a/tools/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt
index 1d93779..e92e0be 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/h5diff/testfiles/h5diff_17.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/h5diff/testfiles/h5diff_18.txt b/tools/h5diff/testfiles/h5diff_18.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_18.txt
diff --git a/tools/testfiles/h5diff_19.txt b/tools/h5diff/testfiles/h5diff_19.txt
index 9ae1285..cda2f73 100644
--- a/tools/testfiles/h5diff_19.txt
+++ b/tools/h5diff/testfiles/h5diff_19.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v -c h5diff_basic1.h5 h5diff_empty.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt
index ebdcd9a..e383972 100644
--- a/tools/testfiles/h5diff_20.txt
+++ b/tools/h5diff/testfiles/h5diff_20.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset g1'
-#############################
 Comparison not possible: </dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP
 --------------------------------
 Some objects are not comparable
diff --git a/tools/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt
index 647b58d..d5b0443 100644
--- a/tools/testfiles/h5diff_21.txt
+++ b/tools/h5diff/testfiles/h5diff_21.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset l1'
-#############################
 Comparison not possible: </dset> is of type H5G_DATASET and </l1> is of type H5G_LINK
 --------------------------------
 Some objects are not comparable
diff --git a/tools/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt
index b664837..d8714a0 100644
--- a/tools/testfiles/h5diff_22.txt
+++ b/tools/h5diff/testfiles/h5diff_22.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 dset t1'
-#############################
 Comparison not possible: </dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE
 --------------------------------
 Some objects are not comparable
diff --git a/tools/h5diff/testfiles/h5diff_23.txt b/tools/h5diff/testfiles/h5diff_23.txt
new file mode 100644
index 0000000..1342765
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_23.txt
@@ -0,0 +1,2 @@
+group  : </g1> and </g1>
+0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_24.txt b/tools/h5diff/testfiles/h5diff_24.txt
new file mode 100644
index 0000000..cc4f0d0
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_24.txt
@@ -0,0 +1,2 @@
+datatype: </t1> and </t1>
+0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_25.txt b/tools/h5diff/testfiles/h5diff_25.txt
new file mode 100644
index 0000000..288c4da
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_25.txt
@@ -0,0 +1,2 @@
+link   : </l1> and </l1>
+0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt
new file mode 100644
index 0000000..916cf63
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_26.txt
@@ -0,0 +1,2 @@
+group  : </g1> and </g2>
+1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_27.txt b/tools/h5diff/testfiles/h5diff_27.txt
new file mode 100644
index 0000000..335119a
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_27.txt
@@ -0,0 +1,2 @@
+datatype: </t1> and </t2>
+1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_28.txt b/tools/h5diff/testfiles/h5diff_28.txt
new file mode 100644
index 0000000..5845fa9
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_28.txt
@@ -0,0 +1,2 @@
+link   : </l1> and </l2>
+1 differences found
diff --git a/tools/testfiles/h5diff_50.txt b/tools/h5diff/testfiles/h5diff_50.txt
index d25dc1d..65b563c 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/h5diff/testfiles/h5diff_50.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset0a dset0b'
-#############################
 dataset: </dset0a> and </dset0b>
 Warning: different storage datatype
 </dset0a> has file datatype H5T_STD_I16LE
diff --git a/tools/testfiles/h5diff_51.txt b/tools/h5diff/testfiles/h5diff_51.txt
index cf20b90..e6402cc 100644
--- a/tools/testfiles/h5diff_51.txt
+++ b/tools/h5diff/testfiles/h5diff_51.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset1a dset1b'
-#############################
 dataset: </dset1a> and </dset1b>
 size:           [3x2]           [3x2]
 position        dset1a          dset1b          difference          
diff --git a/tools/testfiles/h5diff_52.txt b/tools/h5diff/testfiles/h5diff_52.txt
index 86e9463..88febb9 100644
--- a/tools/testfiles/h5diff_52.txt
+++ b/tools/h5diff/testfiles/h5diff_52.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset2a dset2b'
-#############################
 dataset: </dset2a> and </dset2b>
 size:           [3x2]           [3x2]
 position        dset2a          dset2b          difference          
diff --git a/tools/testfiles/h5diff_53.txt b/tools/h5diff/testfiles/h5diff_53.txt
index 2763fb3..554d71a 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/h5diff/testfiles/h5diff_53.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset3a dset4b'
-#############################
 dataset: </dset3a> and </dset4b>
 size:           [3x2]           [3x2]
 position        dset3a          dset4b          difference          
diff --git a/tools/testfiles/h5diff_54.txt b/tools/h5diff/testfiles/h5diff_54.txt
index 4c139de..1e8adfd 100644
--- a/tools/testfiles/h5diff_54.txt
+++ b/tools/h5diff/testfiles/h5diff_54.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset4a dset4b'
-#############################
 dataset: </dset4a> and </dset4b>
 size:           [3x2]           [3x2]
 position        dset4a          dset4b          difference          
diff --git a/tools/testfiles/h5diff_55.txt b/tools/h5diff/testfiles/h5diff_55.txt
index 2a1d496..f895955 100644
--- a/tools/testfiles/h5diff_55.txt
+++ b/tools/h5diff/testfiles/h5diff_55.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset5a dset5b'
-#############################
 dataset: </dset5a> and </dset5b>
 size:           [3x2]           [3x2]
 position        dset5a          dset5b          difference          
diff --git a/tools/testfiles/h5diff_56.txt b/tools/h5diff/testfiles/h5diff_56.txt
index 245d1a0..402db43 100644
--- a/tools/testfiles/h5diff_56.txt
+++ b/tools/h5diff/testfiles/h5diff_56.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset6a dset6b'
-#############################
 dataset: </dset6a> and </dset6b>
 size:           [3x2]           [3x2]
 position        dset6a          dset6b          difference          
diff --git a/tools/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt
index 2b22995..590d355 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/h5diff/testfiles/h5diff_57.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dtypes.h5 h5diff_dtypes.h5 dset7a dset7b'
-#############################
 dataset: </dset7a> and </dset7b>
 Warning: different storage datatype
 </dset7a> has file datatype H5T_STD_I8LE
diff --git a/tools/testfiles/h5diff_58.txt b/tools/h5diff/testfiles/h5diff_58.txt
index b582c88..1ea2493 100644
--- a/tools/testfiles/h5diff_58.txt
+++ b/tools/h5diff/testfiles/h5diff_58.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5 refreg'
-#############################
 dataset: </refreg> and </refreg>
 Referenced dataset      10272            10272
 ------------------------------------------------------------
diff --git a/tools/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index abaf5e7..3697279 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff h5diff_basic1.h5'
-#############################
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
   file2                    File name of the second HDF5 file
diff --git a/tools/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index e786d52..a2f07f2 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -d -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-d -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt
index eef9847..90d9bdb 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/h5diff/testfiles/h5diff_604.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -d 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-d 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 1052312..9e45341 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/h5diff/testfiles/h5diff_605.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -d u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-d u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index cdf291b..31053d5 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -d 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-d 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/h5diff/testfiles/h5diff_607.txt b/tools/h5diff/testfiles/h5diff_607.txt
new file mode 100644
index 0000000..554f2ed
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_607.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+6 differences found
diff --git a/tools/h5diff/testfiles/h5diff_608.txt b/tools/h5diff/testfiles/h5diff_608.txt
new file mode 100644
index 0000000..554f2ed
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_608.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+6 differences found
diff --git a/tools/h5diff/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_609.txt
diff --git a/tools/h5diff/testfiles/h5diff_610.txt b/tools/h5diff/testfiles/h5diff_610.txt
new file mode 100644
index 0000000..554f2ed
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_610.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+6 differences found
diff --git a/tools/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 1cc46c5..0a05b7f 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -p -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-p -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt
index 194a02d..155d7f6 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/h5diff/testfiles/h5diff_613.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -p 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-p 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt
index 1635e76..fac1c6a 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/h5diff/testfiles/h5diff_614.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -p u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-p u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index 9948be5..f40ac2a 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -p 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-p 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/h5diff/testfiles/h5diff_616.txt b/tools/h5diff/testfiles/h5diff_616.txt
new file mode 100644
index 0000000..47a1364
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_616.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+2 differences found
diff --git a/tools/h5diff/testfiles/h5diff_617.txt b/tools/h5diff/testfiles/h5diff_617.txt
new file mode 100644
index 0000000..47a1364
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_617.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+2 differences found
diff --git a/tools/h5diff/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_618.txt
diff --git a/tools/h5diff/testfiles/h5diff_619.txt b/tools/h5diff/testfiles/h5diff_619.txt
new file mode 100644
index 0000000..554f2ed
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_619.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+6 differences found
diff --git a/tools/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 570a0cf..93f1714 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -n -4 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-n -4> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index e4afaef..0cdc67c 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -n 0 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-n 0> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index c2e036f..b821511 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -n u h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-n u> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index e5c6431..d9ce5e6 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -n 0x1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
 <-n 0x1> is not a valid option
 usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
   file1                    File name of the first HDF5 file
diff --git a/tools/h5diff/testfiles/h5diff_625.txt b/tools/h5diff/testfiles/h5diff_625.txt
new file mode 100644
index 0000000..47a1364
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_625.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+2 differences found
diff --git a/tools/h5diff/testfiles/h5diff_626.txt b/tools/h5diff/testfiles/h5diff_626.txt
new file mode 100644
index 0000000..be392ae
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_626.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+3 differences found
diff --git a/tools/h5diff/testfiles/h5diff_627.txt b/tools/h5diff/testfiles/h5diff_627.txt
new file mode 100644
index 0000000..554f2ed
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_627.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+6 differences found
diff --git a/tools/h5diff/testfiles/h5diff_628.txt b/tools/h5diff/testfiles/h5diff_628.txt
new file mode 100644
index 0000000..74decda
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_628.txt
@@ -0,0 +1,2 @@
+dataset: </g1/dset3> and </g1/dset4>
+1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_629.txt b/tools/h5diff/testfiles/h5diff_629.txt
new file mode 100644
index 0000000..4e67f57
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_629.txt
@@ -0,0 +1 @@
+h5diff: <file1.h6>: unable to open file
diff --git a/tools/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt
index bc9efbe..7871f8c 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/h5diff/testfiles/h5diff_70.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_attr1.h5 h5diff_attr2.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt
index 9c0bd33..127ddb2 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/h5diff/testfiles/h5diff_80.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_dset1.h5 h5diff_dset2.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt
index 4df38c0..7007d88 100644
--- a/tools/testfiles/h5diff_90.txt
+++ b/tools/h5diff/testfiles/h5diff_90.txt
@@ -1,6 +1,3 @@
-#############################
-Expected output for 'h5diff -v h5diff_basic2.h5 h5diff_basic2.h5'
-#############################
 
 file1     file2
 ---------------------------------------
diff --git a/tools/testfiles/h5diff_attr1.h5 b/tools/h5diff/testfiles/h5diff_attr1.h5
index c44066b..c44066b 100644
--- a/tools/testfiles/h5diff_attr1.h5
+++ b/tools/h5diff/testfiles/h5diff_attr1.h5
diff --git a/tools/testfiles/h5diff_attr2.h5 b/tools/h5diff/testfiles/h5diff_attr2.h5
index 5de3303..5de3303 100644
--- a/tools/testfiles/h5diff_attr2.h5
+++ b/tools/h5diff/testfiles/h5diff_attr2.h5
diff --git a/tools/testfiles/h5diff_basic1.h5 b/tools/h5diff/testfiles/h5diff_basic1.h5
index 389e2b3..389e2b3 100644
--- a/tools/testfiles/h5diff_basic1.h5
+++ b/tools/h5diff/testfiles/h5diff_basic1.h5
diff --git a/tools/testfiles/h5diff_basic2.h5 b/tools/h5diff/testfiles/h5diff_basic2.h5
index ad45cc0..ad45cc0 100644
--- a/tools/testfiles/h5diff_basic2.h5
+++ b/tools/h5diff/testfiles/h5diff_basic2.h5
diff --git a/tools/testfiles/h5diff_dset1.h5 b/tools/h5diff/testfiles/h5diff_dset1.h5
index ab6b96f..ab6b96f 100644
--- a/tools/testfiles/h5diff_dset1.h5
+++ b/tools/h5diff/testfiles/h5diff_dset1.h5
diff --git a/tools/testfiles/h5diff_dset2.h5 b/tools/h5diff/testfiles/h5diff_dset2.h5
index 3db0c8e..3db0c8e 100644
--- a/tools/testfiles/h5diff_dset2.h5
+++ b/tools/h5diff/testfiles/h5diff_dset2.h5
diff --git a/tools/testfiles/h5diff_dtypes.h5 b/tools/h5diff/testfiles/h5diff_dtypes.h5
index 7c3cd9d..7c3cd9d 100644
--- a/tools/testfiles/h5diff_dtypes.h5
+++ b/tools/h5diff/testfiles/h5diff_dtypes.h5
diff --git a/tools/testfiles/h5diff_empty.h5 b/tools/h5diff/testfiles/h5diff_empty.h5
index 3f0d1df..3f0d1df 100644
--- a/tools/testfiles/h5diff_empty.h5
+++ b/tools/h5diff/testfiles/h5diff_empty.h5
diff --git a/tools/testfiles/h5diff_hyper1.h5 b/tools/h5diff/testfiles/h5diff_hyper1.h5
index ceeff80..ceeff80 100644
--- a/tools/testfiles/h5diff_hyper1.h5
+++ b/tools/h5diff/testfiles/h5diff_hyper1.h5
diff --git a/tools/testfiles/h5diff_hyper2.h5 b/tools/h5diff/testfiles/h5diff_hyper2.h5
index 05a2eb1..05a2eb1 100644
--- a/tools/testfiles/h5diff_hyper2.h5
+++ b/tools/h5diff/testfiles/h5diff_hyper2.h5
diff --git a/tools/testfiles/h5diff_types.h5 b/tools/h5diff/testfiles/h5diff_types.h5
index c835069..c835069 100644
--- a/tools/testfiles/h5diff_types.h5
+++ b/tools/h5diff/testfiles/h5diff_types.h5
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 208bb29..d2fd6f8 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -29,17 +29,31 @@
 ## test file names 
 ###############################################################################
 
-FILE1=h5diff_basic1.h5
-FILE2=h5diff_basic2.h5
-FILE3=h5diff_types.h5
-FILE4=h5diff_dtypes.h5
-FILE5=h5diff_attr1.h5
-FILE6=h5diff_attr2.h5
-FILE7=h5diff_dset1.h5
-FILE8=h5diff_dset2.h5
-FILE9=h5diff_hyper1.h5
-FILE10=h5diff_hyper2.h5
-FILE11=h5diff_empty.h5
+INDIR=$srcdir/testfiles
+
+SRCFILE1=h5diff_basic1.h5
+SRCFILE2=h5diff_basic2.h5
+SRCFILE3=h5diff_types.h5
+SRCFILE4=h5diff_dtypes.h5
+SRCFILE5=h5diff_attr1.h5
+SRCFILE6=h5diff_attr2.h5
+SRCFILE7=h5diff_dset1.h5
+SRCFILE8=h5diff_dset2.h5
+SRCFILE9=h5diff_hyper1.h5
+SRCFILE10=h5diff_hyper2.h5
+SRCFILE11=h5diff_empty.h5
+
+FILE1="$INDIR/$SRCFILE1"
+FILE2="$INDIR/$SRCFILE2"
+FILE3="$INDIR/$SRCFILE3"
+FILE4="$INDIR/$SRCFILE4"
+FILE5="$INDIR/$SRCFILE5"
+FILE6="$INDIR/$SRCFILE6"
+FILE7="$INDIR/$SRCFILE7"
+FILE8="$INDIR/$SRCFILE8"
+FILE9="$INDIR/$SRCFILE9"
+FILE10="$INDIR/$SRCFILE10"
+FILE11="$INDIR/$SRCFILE11"
 
 
 H5DIFF=h5diff               # The tool name
@@ -57,7 +71,7 @@ if test -z "$srcdir"; then
    srcdir=.
 fi
 
-test -d ../testfiles || mkdir ../testfiles
+test -d ./testfiles || mkdir ./testfiles
 
 # Parse option
 #   -p   run ph5diff tests
@@ -172,9 +186,9 @@ STDERR_FILTER() {
 # that throws the shell script off.
 #
 TOOLTEST() {
-    expect="$srcdir/../testfiles/$1"
-    actual="../testfiles/`basename $1 .txt`.out"
-    actual_err="../testfiles/`basename $1 .txt`.err"
+    expect="$srcdir/testfiles/$1"
+    actual="./testfiles/`basename $1 .txt`.out"
+    actual_err="./testfiles/`basename $1 .txt`.err"
     actual_sav=${actual}-sav
     actual_err_sav=${actual_err}-sav
     shift
@@ -187,12 +201,12 @@ TOOLTEST() {
     # Run test.
     # Tflops interprets "$@" as "" when no parameter is given (e.g., the
     # case of missing file name).  Changed it to use $@ till Tflops fixes it.
-    TESTING $H5DIFF $@
+    #TESTING $H5DIFF $@
     (
-	echo "#############################"
-	echo "Expected output for '$H5DIFF $@'" 
-	echo "#############################"
-	cd $srcdir/../testfiles
+	#echo "#############################"
+	#echo "Expected output for '$H5DIFF $@'" 
+	#echo "#############################"
+	#cd $srcdir/testfiles
 	if [ "`uname -s`" = "TFLOPS O/S" ]; then
 	    eval $RUNCMD $H5DIFF_BIN $@
 	else
@@ -259,9 +273,11 @@ SKIP() {
 
 
 ##############################################################################
-##############################################################################
-###			  T H E   T E S T S                                ###
-##############################################################################
+# The tests 
+# To avoid the printing of the complete full path of the test file, that hides
+# all the other parameters for long paths, the printing of the command line 
+# is done first in
+# TESTING with the name only of the test file $TOOL, not its full path $TESTFILE
 ##############################################################################
 
 # ############################################################################
@@ -270,39 +286,51 @@ SKIP() {
 
 
 # 1.0
+TESTING $H5DIFF -h
 TOOLTEST h5diff_10.txt -h
 
 # 1.1 normal mode
+TESTING $H5DIFF $SRCFILE1 $SRCFILE2
 TOOLTEST h5diff_11.txt  $FILE1 $FILE2 
 
 # 1.2 normal mode with objects
+TESTING $H5DIFF $SRCFILE1 $SRCFILE2 g1/dset1 g1/dset2
 TOOLTEST h5diff_12.txt  $FILE1 $FILE2  g1/dset1 g1/dset2
 
 # 1.3 report mode
+TESTING $H5DIFF -r $SRCFILE1 $SRCFILE2
 TOOLTEST h5diff_13.txt -r $FILE1 $FILE2 
 
 # 1.4 report  mode with objects
+TESTING $H5DIFF -r $SRCFILE1 $SRCFILE2 g1/dset1 g1/dset2
 TOOLTEST h5diff_14.txt  -r $FILE1 $FILE2 g1/dset1 g1/dset2
 
 # 1.5 with -d
+TESTING $H5DIFF --report --delta=5 $SRCFILE1 $SRCFILE2 g1/dset3 g1/dset4
 TOOLTEST h5diff_15.txt --report --delta=5 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 1.6.1 with -p (int)
+TESTING $H5DIFF -v -p 0.02 $SRCFILE1 $SRCFILE1 g1/dset5 g1/dset6
 TOOLTEST h5diff_16_1.txt -v -p 0.02 $FILE1 $FILE1 g1/dset5 g1/dset6
 
 # 1.6.2 with -p (unsigned long_long)
+TESTING $H5DIFF --verbose --relative=0.02 $SRCFILE1 $SRCFILE1 g1/dset7 g1/dset8
 TOOLTEST h5diff_16_2.txt --verbose --relative=0.02 $FILE1 $FILE1 g1/dset7 g1/dset8
 
 # 1.6.3 with -p (double)
+TESTING $H5DIFF -v -p 0.02 $SRCFILE1 $SRCFILE1 g1/dset9 g1/dset10
 TOOLTEST h5diff_16_3.txt -v -p 0.02 $FILE1 $FILE1 g1/dset9 g1/dset10
 
 # 1.7 verbose mode
+TESTING $H5DIFF -v $SRCFILE1 $SRCFILE2
 TOOLTEST h5diff_17.txt -v $FILE1 $FILE2   
 
 # 1.8 quiet mode 
+TESTING $H5DIFF -q $SRCFILE1 $SRCFILE2
 TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 
 
 # 1.9 contents mode 
+TESTING $H5DIFF -v -c $SRCFILE1 $SRCFILE11
 TOOLTEST h5diff_19.txt -v -c $FILE1 $FILE11 
 
 # ##############################################################################
@@ -310,12 +338,15 @@ TOOLTEST h5diff_19.txt -v -c $FILE1 $FILE11
 # ##############################################################################
 
 # 2.0
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset g1
 TOOLTEST h5diff_20.txt -v $FILE3 $FILE3  dset g1
 
 # 2.1
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset l1
 TOOLTEST h5diff_21.txt -v $FILE3 $FILE3 dset l1
 
 # 2.2
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 dset t1
 TOOLTEST h5diff_22.txt -v  $FILE3 $FILE3 dset t1
 
 # ##############################################################################
@@ -323,21 +354,27 @@ TOOLTEST h5diff_22.txt -v  $FILE3 $FILE3 dset t1
 # ##############################################################################
 
 # 2.3
+TESTING $H5DIFF  -v $SRCFILE3 $SRCFILE3 g1 g1
 TOOLTEST h5diff_23.txt -v $FILE3 $FILE3 g1 g1
 
 # 2.4
+TESTING $H5DIFF -v  $SRCFILE3 $SRCFILE3 t1 t1
 TOOLTEST h5diff_24.txt -v $FILE3 $FILE3 t1 t1
 
 # 2.5
+TESTING $H5DIFF -v  $SRCFILE3 $SRCFILE3 l1 l1 
 TOOLTEST h5diff_25.txt -v $FILE3 $FILE3 l1 l1 
 
 # 2.6
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 g1 g2
 TOOLTEST h5diff_26.txt -v $FILE3 $FILE3 g1 g2
 
 # 2.7
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 t1 t2
 TOOLTEST h5diff_27.txt -v $FILE3 $FILE3 t1 t2
 
 # 2.8
+TESTING $H5DIFF -v $SRCFILE3 $SRCFILE3 l1 l2
 TOOLTEST h5diff_28.txt -v $FILE3 $FILE3 l1 l2
 
 
@@ -347,30 +384,39 @@ TOOLTEST h5diff_28.txt -v $FILE3 $FILE3 l1 l2
 # ##############################################################################
 
 # 5.0
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4 dset0a dset0b
 TOOLTEST h5diff_50.txt -v $FILE4 $FILE4 dset0a dset0b
 
 # 5.1
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset1a dset1b
 TOOLTEST h5diff_51.txt -v $FILE4 $FILE4 dset1a dset1b
 
 # 5.2
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset2a dset2b
 TOOLTEST h5diff_52.txt -v $FILE4 $FILE4 dset2a dset2b
 
 # 5.3
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset3a dset4b
 TOOLTEST h5diff_53.txt -v $FILE4 $FILE4 dset3a dset4b
 
 # 5.4
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset4a dset4b
 TOOLTEST h5diff_54.txt -v $FILE4 $FILE4 dset4a dset4b
 
 # 5.5
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset5a dset5b
 TOOLTEST h5diff_55.txt -v $FILE4 $FILE4 dset5a dset5b
 
 # 5.6
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset6a dset6b
 TOOLTEST h5diff_56.txt -v $FILE4 $FILE4 dset6a dset6b
 
 # 5.7
+TESTING $H5DIFF -v $SRCFILE4 $SRCFILE4  dset7a dset7b
 TOOLTEST h5diff_57.txt -v $FILE4 $FILE4 dset7a dset7b
 
 # 5.8 (region reference)
+TESTING $H5DIFF -v $SRCFILE7 $SRCFILE8  refreg
 TOOLTEST h5diff_58.txt -v $FILE7 $FILE8 refreg
 
 # ##############################################################################
@@ -379,40 +425,45 @@ TOOLTEST h5diff_58.txt -v $FILE7 $FILE8 refreg
 
 
 # 6.0: Check if the command line number of arguments is less than 3
+TESTING $H5DIFF $SRCFILE1
 TOOLTEST h5diff_600.txt $FILE1 
 
-# 6.1: Check for invalid options
-#TOOLTEST h5diff_601.txt -x $FILE1 $FILE2 
 
 # ##############################################################################
 # # -d 
 # ##############################################################################
 
-# 6.2: no value
-TOOLTEST h5diff_602.txt -d $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.3: negative value
+TESTING $H5DIFF  -d -4 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_603.txt -d -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.4: zero
+TESTING $H5DIFF  -d 0 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_604.txt -d 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.5: non number
+TESTING $H5DIFF -d u $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_605.txt -d u $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.6: hexadecimal
+TESTING $H5DIFF -d 0x1 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_606.txt -d 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.7: string
+TESTING $H5DIFF -d "1" $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_607.txt -d "1" $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.8: repeated option
+TESTING $H5DIFF -d 1 -d 2 $SRCFILE1 $SRCFILE2   g1/dset3 g1/dset4
 TOOLTEST h5diff_608.txt -d 1 -d 2 $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.9: number larger than biggest difference
+TESTING $H5DIFF -d 200 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_609.txt -d 200 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.10: number smaller than smallest difference
+TESTING $H5DIFF -d 1 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_610.txt -d 1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 
@@ -421,31 +472,36 @@ TOOLTEST h5diff_610.txt -d 1 $FILE1 $FILE2 g1/dset3 g1/dset4
 # ##############################################################################
 
 
-# 6.11: no value
-TOOLTEST h5diff_611.txt -r -p $FILE1 $FILE2 g1/dset3 g1/dset4
-
 # 6.12: negative value
+TESTING $H5DIFF -p -4 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_612.txt -p -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.13: zero
+TESTING $H5DIFF -p 0 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_613.txt -p 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.14: non number
+TESTING $H5DIFF -p u $SRCFILE1 $SRCFILE2   g1/dset3 g1/dset4
 TOOLTEST h5diff_614.txt -p u $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.15: hexadecimal
+TESTING $H5DIFF -p 0x1 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_615.txt -p 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.16: string
+TESTING $H5DIFF -p "0.21" $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_616.txt -p "0.21" $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.17: repeated option
+TESTING $H5DIFF -p 0.21 -p 0.22 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_617.txt -p 0.21 -p 0.22 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.18: number larger than biggest difference
+TESTING $H5DIFF -p 2 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_618.txt -p 2 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.19: number smaller than smallest difference
+TESTING $H5DIFF -p 0.005 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_619.txt -p 0.005 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 
@@ -454,55 +510,67 @@ TOOLTEST h5diff_619.txt -p 0.005 $FILE1 $FILE2 g1/dset3 g1/dset4
 # # -n
 # ##############################################################################
 
-
-# 6.20: no value
-TOOLTEST h5diff_620.txt -n $FILE1 $FILE2 g1/dset3 g1/dset4
-
 # 6.21: negative value
+TESTING $H5DIFF -n -4 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_621.txt -n -4 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.22: zero
+TESTING $H5DIFF -n 0 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_622.txt -n 0 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.23: non number
+TESTING $H5DIFF -n u $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_623.txt -n u $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.24: hexadecimal
+TESTING $H5DIFF -n 0x1 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_624.txt -n 0x1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.25: string
+TESTING $H5DIFF -n "2" $SRCFILE1 $SRCFILE2   g1/dset3 g1/dset4
 TOOLTEST h5diff_625.txt -n "2" $FILE1 $FILE2  g1/dset3 g1/dset4
 
 # 6.26: repeated option
+TESTING $H5DIFF -n 2 -n 3 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_626.txt -n 2 -n 3 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.27: number larger than biggest difference
+TESTING $H5DIFF --count=200 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_627.txt --count=200 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.28: number smaller than smallest difference
+TESTING $H5DIFF -n 1 $SRCFILE1 $SRCFILE2  g1/dset3 g1/dset4
 TOOLTEST h5diff_628.txt -n 1 $FILE1 $FILE2 g1/dset3 g1/dset4
 
 # 6.29  non valid files
+TESTING $H5DIFF file1.h6 file2.h6
 TOOLTEST h5diff_629.txt file1.h6 file2.h6
 
 # ##############################################################################
 # 7.  attributes
 # ##############################################################################
+TESTING $H5DIFF -v  $SRCFILE5 $SRCFILE6
 TOOLTEST h5diff_70.txt -v $FILE5 $FILE6 
 
 # ##############################################################################
 # 8.  all dataset datatypes
 # ##############################################################################
+TESTING $H5DIFF -v  $SRCFILE7 $SRCFILE8
 TOOLTEST h5diff_80.txt -v $FILE7 $FILE8 
 
 # 9. compare a file with itself
+TESTING $H5DIFF -v  $SRCFILE2 $SRCFILE2
 TOOLTEST h5diff_90.txt -v $FILE2 $FILE2
 
 # 10. read by hyperslab, print indexes
+TESTING $H5DIFF -v $SRCFILE9 $SRCFILE10
 TOOLTEST h5diff_100.txt -v $FILE9 $FILE10 
 
 # 11. floating point comparison
-TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1  g1/d2  
+TESTING $H5DIFF -v  $SRCFILE1 $SRCFILE1 g1/d1  g1/d2 
+TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1  g1/d2 
+
+TESTING $H5DIFF -v  $SRCFILE1 $SRCFILE1  g1/fp1 g1/fp2 
 TOOLTEST h5diff_102.txt -v $FILE1 $FILE1 g1/fp1 g1/fp2 
 
 # ##############################################################################
diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt
deleted file mode 100644
index 988afe8..0000000
--- a/tools/testfiles/h5diff_11.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
-dataset: </g1/dset1> and </g1/dset1>
-5 differences found
diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt
deleted file mode 100644
index 666a91b..0000000
--- a/tools/testfiles/h5diff_12.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5 g1/dset1 g1/dset2'
-#############################
-dataset: </g1/dset1> and </g1/dset2>
-5 differences found
diff --git a/tools/testfiles/h5diff_18.txt b/tools/testfiles/h5diff_18.txt
deleted file mode 100644
index 24c2e32..0000000
--- a/tools/testfiles/h5diff_18.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -q h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt
deleted file mode 100644
index 74c858a..0000000
--- a/tools/testfiles/h5diff_23.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g1'
-#############################
-group  : </g1> and </g1>
-0 differences found
diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt
deleted file mode 100644
index 75f2e6f..0000000
--- a/tools/testfiles/h5diff_24.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t1'
-#############################
-datatype: </t1> and </t1>
-0 differences found
diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt
deleted file mode 100644
index 8801c31..0000000
--- a/tools/testfiles/h5diff_25.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l1'
-#############################
-link   : </l1> and </l1>
-0 differences found
diff --git a/tools/testfiles/h5diff_26.txt b/tools/testfiles/h5diff_26.txt
deleted file mode 100644
index 24e1190..0000000
--- a/tools/testfiles/h5diff_26.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g2'
-#############################
-group  : </g1> and </g2>
-1 differences found
diff --git a/tools/testfiles/h5diff_27.txt b/tools/testfiles/h5diff_27.txt
deleted file mode 100644
index f62e0e3..0000000
--- a/tools/testfiles/h5diff_27.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t2'
-#############################
-datatype: </t1> and </t2>
-1 differences found
diff --git a/tools/testfiles/h5diff_28.txt b/tools/testfiles/h5diff_28.txt
deleted file mode 100644
index 4222159..0000000
--- a/tools/testfiles/h5diff_28.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l2'
-#############################
-link   : </l1> and </l2>
-1 differences found
diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt
deleted file mode 100644
index 55cd0e0..0000000
--- a/tools/testfiles/h5diff_602.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-#############################
-Expected output for 'h5diff -d h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-<-d h5diff_basic1.h5> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-  file1                    File name of the first HDF5 file
-  file2                    File name of the second HDF5 file
-  [obj1]                   Name of an HDF5 object, in absolute path
-  [obj2]                   Name of an HDF5 object, in absolute path
-  OPTIONS
-   -h, --help              Print a usage message and exit
-   -V, --version           Print version number and exit
-   -r, --report            Report mode. Print differences
-   -v, --verbose           Verbose mode. Print differences, list of objects
-   -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
-   -n C, --count=C         Print differences up to C number
-   -d D, --delta=D         Print difference when greater than limit D
-   -p R, --relative=R      Print difference when greater than relative limit R
-
-  C - is a positive integer
-  D - is a positive number. Compare criteria is |a - b| > D
-  R - is a positive number. Compare criteria is |(b-a)/a| > R
-
- Modes of output:
-
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
-
- Compare criteria
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
-
- The compare criteria is:
-   1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
-   of the linked value
-
- Return exit code:
-
-  1 if differences found, 0 if no differences, -1 if error
-
- Examples of use:
-
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-
-    Compares all objects in both files
-
- Note)  file1 and file2 can be the same file. Use
-
-    h5diff file1 file1 /g1/dset1 /g1/dset2
-
-    to compare '/g1/dset1' and '/g1/dset2' in the same file
-
diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt
deleted file mode 100644
index 1a7c257..0000000
--- a/tools/testfiles/h5diff_607.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-6 differences found
diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt
deleted file mode 100644
index 49b490e..0000000
--- a/tools/testfiles/h5diff_608.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -d 1 -d 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-6 differences found
diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt
deleted file mode 100644
index 9a317f0..0000000
--- a/tools/testfiles/h5diff_609.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt
deleted file mode 100644
index 1a7c257..0000000
--- a/tools/testfiles/h5diff_610.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -d 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-6 differences found
diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt
deleted file mode 100644
index 07aa0cd..0000000
--- a/tools/testfiles/h5diff_611.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-#############################
-Expected output for 'h5diff -r -p h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-<-p h5diff_basic1.h5> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-  file1                    File name of the first HDF5 file
-  file2                    File name of the second HDF5 file
-  [obj1]                   Name of an HDF5 object, in absolute path
-  [obj2]                   Name of an HDF5 object, in absolute path
-  OPTIONS
-   -h, --help              Print a usage message and exit
-   -V, --version           Print version number and exit
-   -r, --report            Report mode. Print differences
-   -v, --verbose           Verbose mode. Print differences, list of objects
-   -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
-   -n C, --count=C         Print differences up to C number
-   -d D, --delta=D         Print difference when greater than limit D
-   -p R, --relative=R      Print difference when greater than relative limit R
-
-  C - is a positive integer
-  D - is a positive number. Compare criteria is |a - b| > D
-  R - is a positive number. Compare criteria is |(b-a)/a| > R
-
- Modes of output:
-
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
-
- Compare criteria
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
-
- The compare criteria is:
-   1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
-   of the linked value
-
- Return exit code:
-
-  1 if differences found, 0 if no differences, -1 if error
-
- Examples of use:
-
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-
-    Compares all objects in both files
-
- Note)  file1 and file2 can be the same file. Use
-
-    h5diff file1 file1 /g1/dset1 /g1/dset2
-
-    to compare '/g1/dset1' and '/g1/dset2' in the same file
-
diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt
deleted file mode 100644
index 164aa15..0000000
--- a/tools/testfiles/h5diff_616.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -p 0.21 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-2 differences found
diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt
deleted file mode 100644
index 3f0f078..0000000
--- a/tools/testfiles/h5diff_617.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -p 0.21 -p 0.22 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-2 differences found
diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt
deleted file mode 100644
index a1bb5a6..0000000
--- a/tools/testfiles/h5diff_618.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt
deleted file mode 100644
index f676315..0000000
--- a/tools/testfiles/h5diff_619.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -p 0.005 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-6 differences found
diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt
deleted file mode 100644
index 03c3e53..0000000
--- a/tools/testfiles/h5diff_620.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-#############################
-Expected output for 'h5diff -n h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-<-n h5diff_basic1.h5> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]] 
-  file1                    File name of the first HDF5 file
-  file2                    File name of the second HDF5 file
-  [obj1]                   Name of an HDF5 object, in absolute path
-  [obj2]                   Name of an HDF5 object, in absolute path
-  OPTIONS
-   -h, --help              Print a usage message and exit
-   -V, --version           Print version number and exit
-   -r, --report            Report mode. Print differences
-   -v, --verbose           Verbose mode. Print differences, list of objects
-   -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
-   -n C, --count=C         Print differences up to C number
-   -d D, --delta=D         Print difference when greater than limit D
-   -p R, --relative=R      Print difference when greater than relative limit R
-
-  C - is a positive integer
-  D - is a positive number. Compare criteria is |a - b| > D
-  R - is a positive number. Compare criteria is |(b-a)/a| > R
-
- Modes of output:
-
-  Default mode: print the number of differences found and where they occured
-  -r Report mode: print the above plus the differences
-  -v Verbose mode: print the above plus a list of objects and warnings
-  -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
-
- Compare criteria
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
-
- The compare criteria is:
-   1) datasets: numerical array differences 2) groups: name string difference
-   3) datatypes: the return value of H5Tequal 2) links: name string difference
-   of the linked value
-
- Return exit code:
-
-  1 if differences found, 0 if no differences, -1 if error
-
- Examples of use:
-
- 1) h5diff file1 file2 /g1/dset1 /g1/dset2
-
-    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
-
- 2) h5diff file1 file2 /g1/dset1
-
-    Compares object '/g1/dset1' in both files
-
- 3) h5diff file1 file2
-
-    Compares all objects in both files
-
- Note)  file1 and file2 can be the same file. Use
-
-    h5diff file1 file1 /g1/dset1 /g1/dset2
-
-    to compare '/g1/dset1' and '/g1/dset2' in the same file
-
diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt
deleted file mode 100644
index 2da804c..0000000
--- a/tools/testfiles/h5diff_625.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -n 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-2 differences found
diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt
deleted file mode 100644
index 2a5fd2f..0000000
--- a/tools/testfiles/h5diff_626.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -n 2 -n 3 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-3 differences found
diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt
deleted file mode 100644
index 95ad39a..0000000
--- a/tools/testfiles/h5diff_627.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff --count=200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-6 differences found
diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt
deleted file mode 100644
index d6fa229..0000000
--- a/tools/testfiles/h5diff_628.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Expected output for 'h5diff -n 1 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
-dataset: </g1/dset3> and </g1/dset4>
-1 differences found
diff --git a/tools/testfiles/h5diff_629.txt b/tools/testfiles/h5diff_629.txt
deleted file mode 100644
index 9f7632f..0000000
--- a/tools/testfiles/h5diff_629.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#############################
-Expected output for 'h5diff file1.h6 file2.h6'
-#############################
-h5diff: <file1.h6>: unable to open file