[svn-r16351] merge 16348

#1368 (E1) h5diff: implement  "not comparable" messages. Implemented RFC. The new option is <-c, --compare           List objects that are not comparable>

added some test cases

tested: windows, linux

tools/h5diff/testfiles/h5diff_10.txt

@@ -9,6 +9,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_16_1.txt

@@ -8,6 +8,3 @@ position        dset5           dset6           difference      relative
 [ 1 1 ]          0               100             100             not comparable
 [ 2 1 ]          100             50              50              0.500000      
 5 differences found
---------------------------------
-Some objects are not comparable
---------------------------------

tools/h5diff/testfiles/h5diff_16_2.txt

@@ -8,6 +8,3 @@ position        dset7           dset8           difference      relative
 [ 1 1 ]          0               100             100             not comparable
 [ 2 1 ]          100             50              50              0.500000      
 5 differences found
---------------------------------
-Some objects are not comparable
---------------------------------

tools/h5diff/testfiles/h5diff_16_3.txt

@@ -8,6 +8,3 @@ position        dset9           dset10          difference      relative
 [ 1 1 ]          0               100             100             not comparable
 [ 2 1 ]          100             50              50              0.5           
 5 differences found
---------------------------------
-Some objects are not comparable
---------------------------------

tools/h5diff/testfiles/h5diff_17.txt

@@ -23,6 +23,12 @@ file1     file2
     x           /g1/fp2        
     x           /g1/ld         
            x    /g2            
+           x    /g2/dset1      
+           x    /g2/dset2      
+           x    /g2/dset3      
+           x    /g2/dset4      
+           x    /g2/dset5      
+           x    /g2/dset6      
 
 group  : </> and </>
 0 differences found

tools/h5diff/testfiles/h5diff_20.txt

@@ -1,4 +1,5 @@
-Comparison not possible: </dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP
+</dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_200.txt

@@ -0,0 +1,4 @@
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_201.txt

@@ -0,0 +1 @@
+</g2/dset1> or </g2/dset2> are empty datasets

tools/h5diff/testfiles/h5diff_202.txt

@@ -0,0 +1,2 @@
+</g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER
+</g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2

tools/h5diff/testfiles/h5diff_203.txt

@@ -0,0 +1,2 @@
+</g2/dset3> has rank 1, dimensions [6], max dimensions [6]
+</g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]

tools/h5diff/testfiles/h5diff_204.txt

@@ -0,0 +1,2 @@
+</g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
+</g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]

tools/h5diff/testfiles/h5diff_205.txt

@@ -0,0 +1,2 @@
+</g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
+</g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]</g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE

tools/h5diff/testfiles/h5diff_21.txt

@@ -1,4 +1,5 @@
-Comparison not possible: </dset> is of type H5G_DATASET and </l1> is of type H5G_LINK
+</dset> is of type H5G_DATASET and </l1> is of type H5G_LINK
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_22.txt

@@ -1,4 +1,5 @@
-Comparison not possible: </dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE
+</dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_57.txt

@@ -2,8 +2,9 @@ dataset: </dset7a> and </dset7b>
 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
+</dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
 0 differences found
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_600.txt

@@ -9,6 +9,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_603.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_604.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_605.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_606.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_612.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_613.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_614.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_615.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_621.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_622.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_623.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_624.txt

@@ -10,6 +10,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
+   -c, --compare           List objects that are not comparable
    -N, --nan               Avoid NaNs detection
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D

tools/h5diff/testfiles/h5diff_70.txt

@@ -2028,3 +2028,4 @@ position        float3D of </g1> float3D of </g1> difference
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_80.txt

@@ -873,3 +873,4 @@ point #4              (2,8)              (1,7)
 --------------------------------
 Some objects are not comparable
 --------------------------------
+Use -c for a list of objects.

tools/h5diff/testfiles/h5diff_90.txt

@@ -7,6 +7,12 @@ file1     file2
     x      x    /g1/dset2      
     x      x    /g1/dset4      
     x      x    /g2            
+    x      x    /g2/dset1      
+    x      x    /g2/dset2      
+    x      x    /g2/dset3      
+    x      x    /g2/dset4      
+    x      x    /g2/dset5      
+    x      x    /g2/dset6      
 
 group  : </> and </>
 0 differences found
@@ -20,3 +26,20 @@ dataset: </g1/dset4> and </g1/dset4>
 0 differences found
 group  : </g2> and </g2>
 0 differences found
+dataset: </g2/dset1> and </g2/dset1>
+</g2/dset1> or </g2/dset1> are empty datasets
+0 differences found
+dataset: </g2/dset2> and </g2/dset2>
+0 differences found
+dataset: </g2/dset3> and </g2/dset3>
+0 differences found
+dataset: </g2/dset4> and </g2/dset4>
+0 differences found
+dataset: </g2/dset5> and </g2/dset5>
+0 differences found
+dataset: </g2/dset6> and </g2/dset6>
+0 differences found
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects.