[svn-r21396] Purpose:
HDFFV-7693 - h5diff produces different behavior between versions: 1.8.3 and 1.8.6
Description:
There were two issues on this.
One was not displaying all the comparable objects if non-comparable
object/attribute exist and compared before comparables ones. This issue
occurred after 1.8.4 release. This is the issue from user.
The other issue was not displaying all the comparable attributes,
if non-comparable object/attribute exist and compared ahead. This issue
were exist even before 1.8.4 release. So it's possible some attribute
comparison may have not displayed correctly in the past, if non-comparable
data were exist in common object.
Fixed h5diff to display all the comparable object and attribute regardless
of non-comparables.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam, Windows)
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
Not comparable: </g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER
|
||||
Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
Not comparable: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
|
||||
and </g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]
|
||||
Not comparable: </g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
8
tools/h5diff/testfiles/h5diff_220.txt
Normal file
8
tools/h5diff/testfiles/h5diff_220.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING
|
||||
attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>>
|
||||
3 differences found
|
||||
dataset: </g1/dset1> and </g1/dset1>
|
||||
3 differences found
|
||||
dataset: </g1/dset2> and </g1/dset2>
|
||||
3 differences found
|
||||
EXIT CODE: 1
|
||||
8
tools/h5diff/testfiles/h5diff_221.txt
Normal file
8
tools/h5diff/testfiles/h5diff_221.txt
Normal file
@@ -0,0 +1,8 @@
|
||||
Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING
|
||||
attribute: <attr2 of </g2/dset1>> and <attr2 of </g2/dset1>>
|
||||
3 differences found
|
||||
dataset: </g2/dset1> and </g2/dset1>
|
||||
6 differences found
|
||||
dataset: </g2/dset2> and </g2/dset2>
|
||||
3 differences found
|
||||
EXIT CODE: 1
|
||||
15
tools/h5diff/testfiles/h5diff_222.txt
Normal file
15
tools/h5diff/testfiles/h5diff_222.txt
Normal file
@@ -0,0 +1,15 @@
|
||||
Not comparable: </g1/dset1> is of class H5T_INTEGER and </g1/dset1> is of class H5T_STRING
|
||||
attribute: <attr of </g1/dset1>> and <attr of </g1/dset1>>
|
||||
3 differences found
|
||||
dataset: </g1/dset1> and </g1/dset1>
|
||||
3 differences found
|
||||
dataset: </g1/dset2> and </g1/dset2>
|
||||
3 differences found
|
||||
Not comparable: <attr1> is of class H5T_INTEGER and <attr1> is of class H5T_STRING
|
||||
attribute: <attr2 of </g2/dset1>> and <attr2 of </g2/dset1>>
|
||||
3 differences found
|
||||
dataset: </g2/dset1> and </g2/dset1>
|
||||
6 differences found
|
||||
dataset: </g2/dset2> and </g2/dset2>
|
||||
3 differences found
|
||||
EXIT CODE: 1
|
||||
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -7,5 +7,5 @@ Not comparable: </dset7a> has sign H5T_SGN_2 and </dset7b> has sign H5T_SGN_NONE
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 0
|
||||
|
||||
@@ -2028,5 +2028,5 @@ position vlen3D of </g1> vlen3D of </g1> difference
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
@@ -2034,5 +2034,5 @@ position vlen3D of </g1> vlen3D of </g1> difference
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
@@ -2133,5 +2133,5 @@ position vlen3D of </g1> vlen3D of </g1> difference
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
@@ -2034,5 +2034,5 @@ position vlen3D of </g1> vlen3D of </g1> difference
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
@@ -2133,5 +2133,5 @@ position vlen3D of </g1> vlen3D of </g1> difference
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
@@ -877,5 +877,5 @@ point #4 (2,8) (1,7)
|
||||
--------------------------------
|
||||
Some objects are not comparable
|
||||
--------------------------------
|
||||
Use -c for a list of objects.
|
||||
Use -c for a list of objects without details of differences.
|
||||
EXIT CODE: 1
|
||||
|
||||
BIN
tools/h5diff/testfiles/non_comparables1.h5
Normal file
BIN
tools/h5diff/testfiles/non_comparables1.h5
Normal file
Binary file not shown.
BIN
tools/h5diff/testfiles/non_comparables2.h5
Normal file
BIN
tools/h5diff/testfiles/non_comparables2.h5
Normal file
Binary file not shown.
Reference in New Issue
Block a user