From 096b0127bcdf36242265e2a41d0cf3f44b39606f Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Thu, 19 Jun 2008 21:05:11 -0500
Subject: [svn-r15246] Changed the shell script to avoid doing a cd $srcdir

The name of the files are now given by its full name relative to $srcdir

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, not its full path

the printing in the expected output that had the file name was removed as well as 3 tests that tested error messages in which the file name was present

tested: linux (in 2 different build directories relative to $srcdir), solaris
---
 MANIFEST                               |   3 -
 tools/h5diff/testfiles/h5diff_10.txt   |   3 -
 tools/h5diff/testfiles/h5diff_100.txt  |   3 -
 tools/h5diff/testfiles/h5diff_101.txt  |   3 -
 tools/h5diff/testfiles/h5diff_102.txt  |   3 -
 tools/h5diff/testfiles/h5diff_11.txt   |   3 -
 tools/h5diff/testfiles/h5diff_12.txt   |   3 -
 tools/h5diff/testfiles/h5diff_13.txt   |   3 -
 tools/h5diff/testfiles/h5diff_14.txt   |   3 -
 tools/h5diff/testfiles/h5diff_15.txt   |   3 -
 tools/h5diff/testfiles/h5diff_16_1.txt |   3 -
 tools/h5diff/testfiles/h5diff_16_2.txt |   3 -
 tools/h5diff/testfiles/h5diff_16_3.txt |   3 -
 tools/h5diff/testfiles/h5diff_17.txt   |   3 -
 tools/h5diff/testfiles/h5diff_18.txt   |   3 -
 tools/h5diff/testfiles/h5diff_20.txt   |   3 -
 tools/h5diff/testfiles/h5diff_21.txt   |   3 -
 tools/h5diff/testfiles/h5diff_22.txt   |   3 -
 tools/h5diff/testfiles/h5diff_23.txt   |   3 -
 tools/h5diff/testfiles/h5diff_24.txt   |   3 -
 tools/h5diff/testfiles/h5diff_25.txt   |   3 -
 tools/h5diff/testfiles/h5diff_26.txt   |   3 -
 tools/h5diff/testfiles/h5diff_27.txt   |   3 -
 tools/h5diff/testfiles/h5diff_28.txt   |   3 -
 tools/h5diff/testfiles/h5diff_50.txt   |   3 -
 tools/h5diff/testfiles/h5diff_51.txt   |   3 -
 tools/h5diff/testfiles/h5diff_52.txt   |   3 -
 tools/h5diff/testfiles/h5diff_53.txt   |   3 -
 tools/h5diff/testfiles/h5diff_54.txt   |   3 -
 tools/h5diff/testfiles/h5diff_55.txt   |   3 -
 tools/h5diff/testfiles/h5diff_56.txt   |   3 -
 tools/h5diff/testfiles/h5diff_57.txt   |   3 -
 tools/h5diff/testfiles/h5diff_58.txt   |   3 -
 tools/h5diff/testfiles/h5diff_600.txt  |   3 -
 tools/h5diff/testfiles/h5diff_602.txt  |  59 ---------------
 tools/h5diff/testfiles/h5diff_603.txt  |   3 -
 tools/h5diff/testfiles/h5diff_604.txt  |   3 -
 tools/h5diff/testfiles/h5diff_605.txt  |   3 -
 tools/h5diff/testfiles/h5diff_606.txt  |   3 -
 tools/h5diff/testfiles/h5diff_607.txt  |   3 -
 tools/h5diff/testfiles/h5diff_608.txt  |   3 -
 tools/h5diff/testfiles/h5diff_609.txt  |   3 -
 tools/h5diff/testfiles/h5diff_610.txt  |   3 -
 tools/h5diff/testfiles/h5diff_611.txt  |  59 ---------------
 tools/h5diff/testfiles/h5diff_612.txt  |   3 -
 tools/h5diff/testfiles/h5diff_613.txt  |   3 -
 tools/h5diff/testfiles/h5diff_614.txt  |   3 -
 tools/h5diff/testfiles/h5diff_615.txt  |   3 -
 tools/h5diff/testfiles/h5diff_616.txt  |   3 -
 tools/h5diff/testfiles/h5diff_617.txt  |   3 -
 tools/h5diff/testfiles/h5diff_618.txt  |   3 -
 tools/h5diff/testfiles/h5diff_619.txt  |   3 -
 tools/h5diff/testfiles/h5diff_620.txt  |  59 ---------------
 tools/h5diff/testfiles/h5diff_621.txt  |   3 -
 tools/h5diff/testfiles/h5diff_622.txt  |   3 -
 tools/h5diff/testfiles/h5diff_623.txt  |   3 -
 tools/h5diff/testfiles/h5diff_624.txt  |   3 -
 tools/h5diff/testfiles/h5diff_625.txt  |   3 -
 tools/h5diff/testfiles/h5diff_626.txt  |   3 -
 tools/h5diff/testfiles/h5diff_627.txt  |   3 -
 tools/h5diff/testfiles/h5diff_628.txt  |   3 -
 tools/h5diff/testfiles/h5diff_629.txt  |   3 -
 tools/h5diff/testfiles/h5diff_70.txt   |   3 -
 tools/h5diff/testfiles/h5diff_80.txt   |   3 -
 tools/h5diff/testfiles/h5diff_90.txt   |   3 -
 tools/h5diff/testh5diff.sh             | 127 +++++++++++++++++++++++++--------
 66 files changed, 96 insertions(+), 394 deletions(-)
 delete mode 100644 tools/h5diff/testfiles/h5diff_602.txt
 delete mode 100644 tools/h5diff/testfiles/h5diff_611.txt
 delete mode 100644 tools/h5diff/testfiles/h5diff_620.txt

diff --git a/MANIFEST b/MANIFEST
index c0c6e0b..d34a5e2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1413,7 +1413,6 @@
 ./tools/h5diff/testfiles/h5diff_57.txt
 ./tools/h5diff/testfiles/h5diff_58.txt
 ./tools/h5diff/testfiles/h5diff_600.txt
-./tools/h5diff/testfiles/h5diff_602.txt
 ./tools/h5diff/testfiles/h5diff_603.txt
 ./tools/h5diff/testfiles/h5diff_604.txt
 ./tools/h5diff/testfiles/h5diff_605.txt
@@ -1422,7 +1421,6 @@
 ./tools/h5diff/testfiles/h5diff_608.txt
 ./tools/h5diff/testfiles/h5diff_609.txt
 ./tools/h5diff/testfiles/h5diff_610.txt
-./tools/h5diff/testfiles/h5diff_611.txt
 ./tools/h5diff/testfiles/h5diff_612.txt
 ./tools/h5diff/testfiles/h5diff_613.txt
 ./tools/h5diff/testfiles/h5diff_614.txt
@@ -1431,7 +1429,6 @@
 ./tools/h5diff/testfiles/h5diff_617.txt
 ./tools/h5diff/testfiles/h5diff_618.txt
 ./tools/h5diff/testfiles/h5diff_619.txt
-./tools/h5diff/testfiles/h5diff_620.txt
 ./tools/h5diff/testfiles/h5diff_621.txt
 ./tools/h5diff/testfiles/h5diff_622.txt
 ./tools/h5diff/testfiles/h5diff_623.txt
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 6a6dbae..887ee9e 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_100.txt b/tools/h5diff/testfiles/h5diff_100.txt
index 82b42ce..32ff7ab 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_101.txt b/tools/h5diff/testfiles/h5diff_101.txt
index 7affe59..03875b7 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_102.txt b/tools/h5diff/testfiles/h5diff_102.txt
index dba340b..3d91a36 100644
--- a/tools/h5diff/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
index 988afe8..e2e33fb 100644
--- a/tools/h5diff/testfiles/h5diff_11.txt
+++ b/tools/h5diff/testfiles/h5diff_11.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
 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
index 666a91b..6b4c747 100644
--- a/tools/h5diff/testfiles/h5diff_12.txt
+++ b/tools/h5diff/testfiles/h5diff_12.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_13.txt b/tools/h5diff/testfiles/h5diff_13.txt
index 834f809..36676e9 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_14.txt b/tools/h5diff/testfiles/h5diff_14.txt
index d0f75b5..3fac3af 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_15.txt b/tools/h5diff/testfiles/h5diff_15.txt
index 529ffc5..386c6e1 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_16_1.txt b/tools/h5diff/testfiles/h5diff_16_1.txt
index 738a0f7..6155ebf 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_16_2.txt b/tools/h5diff/testfiles/h5diff_16_2.txt
index 421bf70..43127bb 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_16_3.txt b/tools/h5diff/testfiles/h5diff_16_3.txt
index 0721799..6da24cf 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt
index 1d93779..e92e0be 100644
--- a/tools/h5diff/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
index 24c2e32..e69de29 100644
--- a/tools/h5diff/testfiles/h5diff_18.txt
+++ b/tools/h5diff/testfiles/h5diff_18.txt
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -q h5diff_basic1.h5 h5diff_basic2.h5'
-#############################
diff --git a/tools/h5diff/testfiles/h5diff_20.txt b/tools/h5diff/testfiles/h5diff_20.txt
index ebdcd9a..e383972 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_21.txt b/tools/h5diff/testfiles/h5diff_21.txt
index 647b58d..d5b0443 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_22.txt b/tools/h5diff/testfiles/h5diff_22.txt
index b664837..d8714a0 100644
--- a/tools/h5diff/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
index 74c858a..1342765 100644
--- a/tools/h5diff/testfiles/h5diff_23.txt
+++ b/tools/h5diff/testfiles/h5diff_23.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g1'
-#############################
 group  : </g1> and </g1>
 0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_24.txt b/tools/h5diff/testfiles/h5diff_24.txt
index 75f2e6f..cc4f0d0 100644
--- a/tools/h5diff/testfiles/h5diff_24.txt
+++ b/tools/h5diff/testfiles/h5diff_24.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t1'
-#############################
 datatype: </t1> and </t1>
 0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_25.txt b/tools/h5diff/testfiles/h5diff_25.txt
index 8801c31..288c4da 100644
--- a/tools/h5diff/testfiles/h5diff_25.txt
+++ b/tools/h5diff/testfiles/h5diff_25.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l1'
-#############################
 link   : </l1> and </l1>
 0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_26.txt b/tools/h5diff/testfiles/h5diff_26.txt
index 24e1190..916cf63 100644
--- a/tools/h5diff/testfiles/h5diff_26.txt
+++ b/tools/h5diff/testfiles/h5diff_26.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 g1 g2'
-#############################
 group  : </g1> and </g2>
 1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_27.txt b/tools/h5diff/testfiles/h5diff_27.txt
index f62e0e3..335119a 100644
--- a/tools/h5diff/testfiles/h5diff_27.txt
+++ b/tools/h5diff/testfiles/h5diff_27.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 t1 t2'
-#############################
 datatype: </t1> and </t2>
 1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_28.txt b/tools/h5diff/testfiles/h5diff_28.txt
index 4222159..5845fa9 100644
--- a/tools/h5diff/testfiles/h5diff_28.txt
+++ b/tools/h5diff/testfiles/h5diff_28.txt
@@ -1,5 +1,2 @@
-#############################
-Expected output for 'h5diff -v h5diff_types.h5 h5diff_types.h5 l1 l2'
-#############################
 link   : </l1> and </l2>
 1 differences found
diff --git a/tools/h5diff/testfiles/h5diff_50.txt b/tools/h5diff/testfiles/h5diff_50.txt
index d25dc1d..65b563c 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_51.txt b/tools/h5diff/testfiles/h5diff_51.txt
index cf20b90..e6402cc 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_52.txt b/tools/h5diff/testfiles/h5diff_52.txt
index 86e9463..88febb9 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_53.txt b/tools/h5diff/testfiles/h5diff_53.txt
index 2763fb3..554d71a 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_54.txt b/tools/h5diff/testfiles/h5diff_54.txt
index 4c139de..1e8adfd 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_55.txt b/tools/h5diff/testfiles/h5diff_55.txt
index 2a1d496..f895955 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_56.txt b/tools/h5diff/testfiles/h5diff_56.txt
index 245d1a0..402db43 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_57.txt b/tools/h5diff/testfiles/h5diff_57.txt
index 2b22995..590d355 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_58.txt b/tools/h5diff/testfiles/h5diff_58.txt
index b582c88..1ea2493 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index 56cc052..82b69d9 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_602.txt b/tools/h5diff/testfiles/h5diff_602.txt
deleted file mode 100644
index cc522bd..0000000
--- a/tools/h5diff/testfiles/h5diff_602.txt
+++ /dev/null
@@ -1,59 +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
-   -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
-
- 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
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. 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
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 352e75e..9ddf674 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt
index dde3f37..763999d 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 8047b46..e00bf5b 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index d1d83a1..3d77495 100644
--- a/tools/h5diff/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
index 1a7c257..554f2ed 100644
--- a/tools/h5diff/testfiles/h5diff_607.txt
+++ b/tools/h5diff/testfiles/h5diff_607.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_608.txt b/tools/h5diff/testfiles/h5diff_608.txt
index 49b490e..554f2ed 100644
--- a/tools/h5diff/testfiles/h5diff_608.txt
+++ b/tools/h5diff/testfiles/h5diff_608.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt
index 9a317f0..e69de29 100644
--- a/tools/h5diff/testfiles/h5diff_609.txt
+++ b/tools/h5diff/testfiles/h5diff_609.txt
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -d 200 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
diff --git a/tools/h5diff/testfiles/h5diff_610.txt b/tools/h5diff/testfiles/h5diff_610.txt
index 1a7c257..554f2ed 100644
--- a/tools/h5diff/testfiles/h5diff_610.txt
+++ b/tools/h5diff/testfiles/h5diff_610.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_611.txt b/tools/h5diff/testfiles/h5diff_611.txt
deleted file mode 100644
index 0b148a0..0000000
--- a/tools/h5diff/testfiles/h5diff_611.txt
+++ /dev/null
@@ -1,59 +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
-   -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
-
- 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
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. 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
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 2aa4804..8f665b8 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt
index dff7f7c..f3f16fd 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt
index 6090f4a..c78fc8c 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index fe7f9a4..d25b847 100644
--- a/tools/h5diff/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
index 164aa15..47a1364 100644
--- a/tools/h5diff/testfiles/h5diff_616.txt
+++ b/tools/h5diff/testfiles/h5diff_616.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_617.txt b/tools/h5diff/testfiles/h5diff_617.txt
index 3f0f078..47a1364 100644
--- a/tools/h5diff/testfiles/h5diff_617.txt
+++ b/tools/h5diff/testfiles/h5diff_617.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt
index a1bb5a6..e69de29 100644
--- a/tools/h5diff/testfiles/h5diff_618.txt
+++ b/tools/h5diff/testfiles/h5diff_618.txt
@@ -1,3 +0,0 @@
-#############################
-Expected output for 'h5diff -p 2 h5diff_basic1.h5 h5diff_basic2.h5 g1/dset3 g1/dset4'
-#############################
diff --git a/tools/h5diff/testfiles/h5diff_619.txt b/tools/h5diff/testfiles/h5diff_619.txt
index f676315..554f2ed 100644
--- a/tools/h5diff/testfiles/h5diff_619.txt
+++ b/tools/h5diff/testfiles/h5diff_619.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_620.txt b/tools/h5diff/testfiles/h5diff_620.txt
deleted file mode 100644
index 9221c76..0000000
--- a/tools/h5diff/testfiles/h5diff_620.txt
+++ /dev/null
@@ -1,59 +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
-   -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
-
- 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
-
- If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. 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
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index e27b486..21dac0b 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 4b6c1a1..c46356a 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index f4edf37..7ae15e8 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index babc43f..caf4e62 100644
--- a/tools/h5diff/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
index 2da804c..47a1364 100644
--- a/tools/h5diff/testfiles/h5diff_625.txt
+++ b/tools/h5diff/testfiles/h5diff_625.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_626.txt b/tools/h5diff/testfiles/h5diff_626.txt
index 2a5fd2f..be392ae 100644
--- a/tools/h5diff/testfiles/h5diff_626.txt
+++ b/tools/h5diff/testfiles/h5diff_626.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_627.txt b/tools/h5diff/testfiles/h5diff_627.txt
index 95ad39a..554f2ed 100644
--- a/tools/h5diff/testfiles/h5diff_627.txt
+++ b/tools/h5diff/testfiles/h5diff_627.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_628.txt b/tools/h5diff/testfiles/h5diff_628.txt
index d6fa229..74decda 100644
--- a/tools/h5diff/testfiles/h5diff_628.txt
+++ b/tools/h5diff/testfiles/h5diff_628.txt
@@ -1,5 +1,2 @@
-#############################
-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/h5diff/testfiles/h5diff_629.txt b/tools/h5diff/testfiles/h5diff_629.txt
index 9f7632f..4e67f57 100644
--- a/tools/h5diff/testfiles/h5diff_629.txt
+++ b/tools/h5diff/testfiles/h5diff_629.txt
@@ -1,4 +1 @@
-#############################
-Expected output for 'h5diff file1.h6 file2.h6'
-#############################
 h5diff: <file1.h6>: unable to open file
diff --git a/tools/h5diff/testfiles/h5diff_70.txt b/tools/h5diff/testfiles/h5diff_70.txt
index bc9efbe..7871f8c 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_80.txt b/tools/h5diff/testfiles/h5diff_80.txt
index 9c0bd33..127ddb2 100644
--- a/tools/h5diff/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/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt
index 4df38c0..7007d88 100644
--- a/tools/h5diff/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/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 6e31feb..a2a9ecc 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -29,17 +29,29 @@
 ## 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
+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
+
+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"
 
 
 H5DIFF=h5diff               # The tool name
@@ -187,12 +199,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 +271,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,36 +284,47 @@ 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 
 
 # ##############################################################################
@@ -307,12 +332,15 @@ TOOLTEST h5diff_18.txt -q $FILE1 $FILE2
 # ##############################################################################
 
 # 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
 
 # ##############################################################################
@@ -320,21 +348,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
 
 
@@ -344,30 +378,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
 
 # ##############################################################################
@@ -376,40 +419,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
 
 
@@ -418,31 +466,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
 
 
@@ -451,55 +504,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 
 
 # ##############################################################################
-- 
cgit v0.12