[svn-r12124] Purpose:

bug fix

Description:
1) the compare flag test was not being put in a correct place, making comparisons attempts that were not supposed to be done
2) some duplicate warnings were being made

Solution:
eliminate the duplicate warnings, put the if compare flag on the correct place

Platforms tested:
linux 32, 64
solaris

Misc. update:

14 files changed, 12 insertions, 40 deletions

diff --git a/tools/testfiles/file1.h5 b/tools/testfiles/file1.h5
index 51808c4..fedeac4 100644
--- a/tools/testfiles/file1.h5
+++ b/tools/testfiles/file1.h5
diff --git a/tools/testfiles/file2.h5 b/tools/testfiles/file2.h5
index 7c14cf3..18c0b01 100644
--- a/tools/testfiles/file2.h5
+++ b/tools/testfiles/file2.h5
diff --git a/tools/testfiles/file3.h5 b/tools/testfiles/file3.h5
index 3c63d04..1431f3a 100644
--- a/tools/testfiles/file3.h5
+++ b/tools/testfiles/file3.h5
diff --git a/tools/testfiles/file4.h5 b/tools/testfiles/file4.h5
index 9b9ebdb..b85c07e 100644
--- a/tools/testfiles/file4.h5
+++ b/tools/testfiles/file4.h5
diff --git a/tools/testfiles/file5.h5 b/tools/testfiles/file5.h5
index ffde01b..2cf5163 100644
--- a/tools/testfiles/file5.h5
+++ b/tools/testfiles/file5.h5
diff --git a/tools/testfiles/file6.h5 b/tools/testfiles/file6.h5
index 795ab83..d421db6 100644
--- a/tools/testfiles/file6.h5
+++ b/tools/testfiles/file6.h5
diff --git a/tools/testfiles/file7.h5 b/tools/testfiles/file7.h5
index 2f48a22..0fa727e 100644
--- a/tools/testfiles/file7.h5
+++ b/tools/testfiles/file7.h5
diff --git a/tools/testfiles/file8.h5 b/tools/testfiles/file8.h5
index d137911..ff2c51b 100644
--- a/tools/testfiles/file8.h5
+++ b/tools/testfiles/file8.h5
diff --git a/tools/testfiles/h5diff_11.txt b/tools/testfiles/h5diff_11.txt
index 8a2f3ee..056e486 100644
--- a/tools/testfiles/h5diff_11.txt
+++ b/tools/testfiles/h5diff_11.txt
@@ -3,7 +3,3 @@ Expected output for 'h5diff file1.h5 file2.h5'
 #############################
 Dataset:     </g1/dset1> and </g1/dset1>
 4 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -v for a list of objects.
diff --git a/tools/testfiles/h5diff_13.txt b/tools/testfiles/h5diff_13.txt
index d498276..53f44c1 100644
--- a/tools/testfiles/h5diff_13.txt
+++ b/tools/testfiles/h5diff_13.txt
@@ -9,7 +9,3 @@ position        dset1           dset1           difference
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
 4 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
-Use -v for a list of objects.
diff --git a/tools/testfiles/h5diff_17.txt b/tools/testfiles/h5diff_17.txt
index 115547c..88047c9 100644
--- a/tools/testfiles/h5diff_17.txt
+++ b/tools/testfiles/h5diff_17.txt
@@ -6,9 +6,11 @@ file1     file2
 ---------------------------------------
     x      x    /g1            
     x      x    /g1/dset1      
-    x      x    /g1/dset2      
+           x    /g1/dset2      
     x           /g1/dset3      
-    x      x    /g1/dset4      
+           x    /g1/dset4      
+    x           /g1/dset5      
+    x           /g1/dset6      
            x    /g2            
 
 Group:       </g1> and </g1>
@@ -21,22 +23,5 @@ position        dset1           dset1           difference
 [ 1 1 ]          1.000000        1.001000        0.001000       
 [ 2 0 ]          1.000000        1.000100        0.000100       
 4 differences found
-Dataset:     </g1/dset2> and </g1/dset2>
-Comparison not possible: </g1/dset2> is of class H5T_INTEGER and </g1/dset2> is of class H5T_FLOAT
-Warning: Different storage datatype
-</g1/dset2> has file datatype H5T_STD_I32LE
-</g1/dset2> has file datatype H5T_IEEE_F64LE
-Comparison not supported: </g1/dset2> has sign H5T_SGN_2 and </g1/dset2> has sign H5T_SGN_ERROR
-0 differences found
-Dataset:     </g1/dset4> and </g1/dset4>
-Comparison not possible: </g1/dset4> is of class H5T_INTEGER and </g1/dset4> is of class H5T_FLOAT
-Warning: Different storage datatype
-</g1/dset4> has file datatype H5T_STD_I32LE
-</g1/dset4> has file datatype H5T_IEEE_F64LE
-Comparison not supported: </g1/dset4> has sign H5T_SGN_2 and </g1/dset4> has sign H5T_SGN_ERROR
-0 differences found
 Group:       </> and </>
 0 differences found
---------------------------------
-Some objects are not comparable
---------------------------------
diff --git a/tools/testfiles/h5diff_50.txt b/tools/testfiles/h5diff_50.txt
index 0827f0d..e76231e 100644
--- a/tools/testfiles/h5diff_50.txt
+++ b/tools/testfiles/h5diff_50.txt
@@ -5,9 +5,6 @@ Dataset:     </dset0a> and </dset0b>
 Warning: Different storage datatype
 </dset0a> has file datatype H5T_STD_I16LE
 </dset0b> has file datatype H5T_STD_I32LE
-Warning: Different storage datatype
-</dset0a> has file datatype H5T_STD_I16LE
-</dset0b> has file datatype H5T_STD_I32LE
 position        dset0a          dset0b          difference          
 ------------------------------------------------------------
 [ 1 0 ]          1               3               2              
diff --git a/tools/testfiles/h5diff_53.txt b/tools/testfiles/h5diff_53.txt
index 24100d6..814ae9a 100644
--- a/tools/testfiles/h5diff_53.txt
+++ b/tools/testfiles/h5diff_53.txt
@@ -2,12 +2,6 @@
 Expected output for 'h5diff file4.h5 file4.h5 -v dset3a dset4b'
 #############################
 Dataset:     </dset3a> and </dset4b>
-Warning: Different storage datatype
-</dset3a> has file datatype H5T_STD_I32LE
-</dset4b> has file datatype H5T_STD_I64LE
-Warning: Different storage datatype
-</dset3a> has file datatype H5T_STD_I32LE
-</dset4b> has file datatype H5T_STD_I64LE
 position        dset3a          dset4b          difference          
 ------------------------------------------------------------
 [ 1 0 ]          1               3               2              
diff --git a/tools/testfiles/h5diff_57.txt b/tools/testfiles/h5diff_57.txt
index 32ced1c..82c0afc 100644
--- a/tools/testfiles/h5diff_57.txt
+++ b/tools/testfiles/h5diff_57.txt
@@ -5,11 +5,15 @@ Dataset:     </dset7a> and </dset7b>
 Warning: Different storage datatype
 </dset7a> has file datatype H5T_STD_I8LE
 </dset7b> has file datatype H5T_STD_U8LE
-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
+position        dset7a          dset7b          difference          
+------------------------------------------------------------
+[ 0 0 ]          -1              1               2              
+[ 1 0 ]          -1              1               2              
+[ 1 1 ]          -1              1               2              
+[ 2 0 ]          -1              1               2              
+[ 2 1 ]          -1              1               2              
+5 differences found
 --------------------------------
 Some objects are not comparable
 --------------------------------