[svn-r10994] Purpose:

bug fix

Description:
when 2 objects were not comparable, the final print information for the non verbose mode printed "0 differences found"


Solution:

replaced instead with a Summary message that says
"Some objects were not comparable"


Platforms tested:
linux
solaris


Misc. update:

36 files changed, 114 insertions, 8 deletions

diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt
index 056e486..8500115 100644
--- a/tools/testfiles/h5diff_11.txt
+++ b/tools/testfiles/h5diff_11.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5'
 #############################
 Dataset:     </g1/dset1> and </g1/dset1>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_12.txt b/tools/testfiles/h5diff_12.txt
index d4605b2..63ac461 100644
--- a/tools/testfiles/h5diff_12.txt
+++ b/tools/testfiles/h5diff_12.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 g1/dset1 g1/dset2'
 #############################
 Dataset:     </g1/dset1> and </g1/dset2>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index 53f44c1..ebe991b 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -8,4 +8,7 @@ position        dset1           dset1           difference
 [ 1 0 ]          1.000000        1.010000        0.010000       
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_14.txt b/tools/testfiles/h5diff_14.txt
index 15e4dee..53388ac 100644
--- a/tools/testfiles/h5diff_14.txt
+++ b/tools/testfiles/h5diff_14.txt
@@ -8,4 +8,7 @@ position        dset1           dset2           difference
 [ 1 0 ]          1.000000        1.010000        0.010000       
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_15.txt b/tools/testfiles/h5diff_15.txt
index 47789c4..295bdb3 100644
--- a/tools/testfiles/h5diff_15.txt
+++ b/tools/testfiles/h5diff_15.txt
@@ -10,4 +10,7 @@ position        dset3           dset4           difference
 [ 1 1 ]          100.000000      80.000000       20.000000      
 [ 2 0 ]          100.000000      140.000000      40.000000      
 [ 2 1 ]          100.000000      200.000000      100.000000     
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_16.txt b/tools/testfiles/h5diff_16.txt
index 5bff6fb..b8a78d6 100644
--- a/tools/testfiles/h5diff_16.txt
+++ b/tools/testfiles/h5diff_16.txt
@@ -10,4 +10,7 @@ position        dset3           dset4           difference      relative
 [ 1 1 ]          100             80              20              0.2           
 [ 2 0 ]          100             140             40              0.4           
 [ 2 1 ]          100             200             100             1             
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index 3ba4b74..ca7c491 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -20,4 +20,7 @@ position        dset1           dset1           difference
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
 Group:       </> and </>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_20.txt b/tools/testfiles/h5diff_20.txt
index e524fd6..086a847 100644
--- a/tools/testfiles/h5diff_20.txt
+++ b/tools/testfiles/h5diff_20.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v dset group'
 #############################
 Comparison not possible: </dset> is of type H5G_DATASET and </group> is of type H5G_GROUP
-0 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable
diff --git a/tools/testfiles/h5diff_21.txt b/tools/testfiles/h5diff_21.txt
index a22a665..bc79754 100644
--- a/tools/testfiles/h5diff_21.txt
+++ b/tools/testfiles/h5diff_21.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v dset link'
 #############################
 Comparison not possible: </dset> is of type H5G_DATASET and </link> is of type H5G_LINK
-0 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable
diff --git a/tools/testfiles/h5diff_22.txt b/tools/testfiles/h5diff_22.txt
index 1c4b45a..57123fb 100644
--- a/tools/testfiles/h5diff_22.txt
+++ b/tools/testfiles/h5diff_22.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v dset type'
 #############################
 Comparison not possible: </dset> is of type H5G_DATASET and </type> is of type H5G_TYPE
-0 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable
diff --git a/tools/testfiles/h5diff_23.txt b/tools/testfiles/h5diff_23.txt
index d709dc6..e0801b0 100644
--- a/tools/testfiles/h5diff_23.txt
+++ b/tools/testfiles/h5diff_23.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v group group'
 #############################
 Group:       </group> and </group>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 0 differences found
diff --git a/tools/testfiles/h5diff_24.txt b/tools/testfiles/h5diff_24.txt
index 467038a..13acf40 100644
--- a/tools/testfiles/h5diff_24.txt
+++ b/tools/testfiles/h5diff_24.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v type type'
 #############################
 Datatype:    </type> and </type>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 0 differences found
diff --git a/tools/testfiles/h5diff_25.txt b/tools/testfiles/h5diff_25.txt
index dabfe91..15d8583 100644
--- a/tools/testfiles/h5diff_25.txt
+++ b/tools/testfiles/h5diff_25.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file3.h5 file3.h5 -v link link'
 #############################
 Link:        </link> and </link>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 0 differences found
diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt
index 0827f0d..9703403 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/testfiles/h5diff_50.txt
@@ -14,4 +14,7 @@ position        dset0a          dset0b          difference
 [ 1 1 ]          1               4               3              
 [ 2 0 ]          1               5               4              
 [ 2 1 ]          1               6               5              
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_51.txt b/tools/testfiles/h5diff_51.txt
index d63f7da..11869b2 100644
--- a/tools/testfiles/h5diff_51.txt
+++ b/tools/testfiles/h5diff_51.txt
@@ -8,4 +8,7 @@ position        dset1a          dset1b          difference
 [ 1 1 ]          1               4               3              
 [ 2 0 ]          1               5               4              
 [ 2 1 ]          1               6               5              
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_52.txt b/tools/testfiles/h5diff_52.txt
index 2742164..81ad53e 100644
--- a/tools/testfiles/h5diff_52.txt
+++ b/tools/testfiles/h5diff_52.txt
@@ -8,4 +8,7 @@ position        dset2a          dset2b          difference
 [ 1 1 ]          1               4               3              
 [ 2 0 ]          1               5               4              
 [ 2 1 ]          1               6               5              
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt
index 814ae9a..da6aef6 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/testfiles/h5diff_53.txt
@@ -8,4 +8,7 @@ position        dset3a          dset4b          difference
 [ 1 1 ]          1               4               3              
 [ 2 0 ]          1               5               4              
 [ 2 1 ]          1               6               5              
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_54.txt b/tools/testfiles/h5diff_54.txt
index 65074cf..33d7dde 100644
--- a/tools/testfiles/h5diff_54.txt
+++ b/tools/testfiles/h5diff_54.txt
@@ -8,4 +8,7 @@ position        dset4a          dset4b          difference
 [ 1 1 ]          1               4               3              
 [ 2 0 ]          1               5               4              
 [ 2 1 ]          1               6               5              
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_55.txt b/tools/testfiles/h5diff_55.txt
index ba97356..dedf59d 100644
--- a/tools/testfiles/h5diff_55.txt
+++ b/tools/testfiles/h5diff_55.txt
@@ -8,4 +8,7 @@ position        dset5a          dset5b          difference
 [ 1 1 ]          1.000000        4.000000        3.000000       
 [ 2 0 ]          1.000000        5.000000        4.000000       
 [ 2 1 ]          1.000000        6.000000        5.000000       
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_56.txt b/tools/testfiles/h5diff_56.txt
index 1a00da1..acc318c 100644
--- a/tools/testfiles/h5diff_56.txt
+++ b/tools/testfiles/h5diff_56.txt
@@ -8,4 +8,7 @@ position        dset6a          dset6b          difference
 [ 1 1 ]          1.000000        4.000000        3.000000       
 [ 2 0 ]          1.000000        5.000000        4.000000       
 [ 2 1 ]          1.000000        6.000000        5.000000       
+----------------------------------------------------
+Summary
+----------------------------------------------------
 4 differences found
diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt
index b4424a5..3917aad 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/testfiles/h5diff_57.txt
@@ -9,4 +9,7 @@ Warning: Different storage datatype
 </dset7a> has file datatype H5T_STD_I8LE
 </dset7b> has file datatype H5T_STD_U8LE
 Comparison not supported: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
-0 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable
diff --git a/tools/testfiles/h5diff_607.txt b/tools/testfiles/h5diff_607.txt
index fa296f7..24550f0 100644
--- a/tools/testfiles/h5diff_607.txt
+++ b/tools/testfiles/h5diff_607.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_608.txt b/tools/testfiles/h5diff_608.txt
index 073322f..f0eaea5 100644
--- a/tools/testfiles/h5diff_608.txt
+++ b/tools/testfiles/h5diff_608.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_609.txt b/tools/testfiles/h5diff_609.txt
index 1312380..378615e 100644
--- a/tools/testfiles/h5diff_609.txt
+++ b/tools/testfiles/h5diff_609.txt
@@ -1,4 +1,7 @@
 #############################
 Expected output for 'h5diff file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4'
 #############################
+----------------------------------------------------
+Summary
+----------------------------------------------------
 0 differences found
diff --git a/tools/testfiles/h5diff_610.txt b/tools/testfiles/h5diff_610.txt
index fa296f7..24550f0 100644
--- a/tools/testfiles/h5diff_610.txt
+++ b/tools/testfiles/h5diff_610.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_616.txt b/tools/testfiles/h5diff_616.txt
index 0f71910..ccd8d48 100644
--- a/tools/testfiles/h5diff_616.txt
+++ b/tools/testfiles/h5diff_616.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 2 differences found
diff --git a/tools/testfiles/h5diff_617.txt b/tools/testfiles/h5diff_617.txt
index ef74c72..4ce6c4a 100644
--- a/tools/testfiles/h5diff_617.txt
+++ b/tools/testfiles/h5diff_617.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 2 differences found
diff --git a/tools/testfiles/h5diff_618.txt b/tools/testfiles/h5diff_618.txt
index d436346..5f8ba8a 100644
--- a/tools/testfiles/h5diff_618.txt
+++ b/tools/testfiles/h5diff_618.txt
@@ -1,4 +1,7 @@
 #############################
 Expected output for 'h5diff file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4'
 #############################
+----------------------------------------------------
+Summary
+----------------------------------------------------
 0 differences found
diff --git a/tools/testfiles/h5diff_619.txt b/tools/testfiles/h5diff_619.txt
index 18d1efb..ea877cd 100644
--- a/tools/testfiles/h5diff_619.txt
+++ b/tools/testfiles/h5diff_619.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_625.txt b/tools/testfiles/h5diff_625.txt
index 74477c8..ab4d206 100644
--- a/tools/testfiles/h5diff_625.txt
+++ b/tools/testfiles/h5diff_625.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -n 2 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 2 differences found
diff --git a/tools/testfiles/h5diff_626.txt b/tools/testfiles/h5diff_626.txt
index 85eb7dc..19d7089 100644
--- a/tools/testfiles/h5diff_626.txt
+++ b/tools/testfiles/h5diff_626.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 3 differences found
diff --git a/tools/testfiles/h5diff_627.txt b/tools/testfiles/h5diff_627.txt
index 999bbc3..22c2a78 100644
--- a/tools/testfiles/h5diff_627.txt
+++ b/tools/testfiles/h5diff_627.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 6 differences found
diff --git a/tools/testfiles/h5diff_628.txt b/tools/testfiles/h5diff_628.txt
index 604df64..8e47534 100644
--- a/tools/testfiles/h5diff_628.txt
+++ b/tools/testfiles/h5diff_628.txt
@@ -2,4 +2,7 @@
 Expected output for 'h5diff file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4'
 #############################
 Dataset:     </g1/dset3> and </g1/dset4>
+----------------------------------------------------
+Summary
+----------------------------------------------------
 1 differences found
diff --git a/tools/testfiles/h5diff_629.txt b/tools/testfiles/h5diff_629.txt
index 8f25c6e..db546ae 100644
--- a/tools/testfiles/h5diff_629.txt
+++ b/tools/testfiles/h5diff_629.txt
@@ -2,5 +2,6 @@
 Expected output for 'h5diff file1.h6 file2.h6'
 #############################
 h5diff: <file1.h6>: unable to open file
-No common objects found. Files are not comparable.
-Use -v for a list of objects.
+----------------------------------------------------
+Summary
+----------------------------------------------------
diff --git a/tools/testfiles/h5diff_70.txt b/tools/testfiles/h5diff_70.txt
index a44b4de..5d154ed 100644
--- a/tools/testfiles/h5diff_70.txt
+++ b/tools/testfiles/h5diff_70.txt
@@ -1139,4 +1139,7 @@ position        float3D of </>  float3D of </>  difference
 [ 3 2 0 ]          23.000000       0.000000        23.000000      
 [ 3 2 1 ]          24.000000       0.000000        24.000000      
 24 differences found
-0 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable
diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt
index 8f7adca..5929c44 100644
--- a/tools/testfiles/h5diff_80.txt
+++ b/tools/testfiles/h5diff_80.txt
@@ -679,4 +679,7 @@ position        vlen3D          vlen3D          difference
 [ 3 2 1 ]          58              0               58             
 [ 3 2 1 ]          59              0               59             
 Group:       </> and </>
-491 differences found
+----------------------------------------------------
+Summary
+----------------------------------------------------
+Some objects are not comparable