philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r20294] Purpose:

Browse Source 
Fixed CHICAGO: Bug 2121 - h5diff - incorrect and lack of output for the 
    different set of attributes (different number and names)

Description:
    Previously h5diff compared attributes correctly only when two objects have 
    the same number of attributes and attribute names are identical.
    This fix covers all other cases.
    Also didn't display useful information about attribute difference.
    This fixes both issues.

     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)
This commit is contained in:
Jonathan Kim
2011-03-22 10:47:07 -05:00
parent f92d2371ff
commit 4147de8d02
25 changed files with 10667 additions and 1324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
tools/h5diff/testfiles/h5diff_710.txt Normal file
View File

@@ -0,0 +1,108 @@
file1 file2
---------------------------------------
x x /
x x /dset
x x /g
x x /g2
x x /g3
x x /g4
x x /ntype
group : </> and </>
0 differences found
obj1 obj2
--------------------------------------
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
dataset: </dset> and </dset>
obj1 obj2
--------------------------------------
x float2
x float3
x x integer1
Attributes status: 1 common, 1 only in obj1, 1 only in obj2
attribute: <integer1 of </dset>> and <integer1 of </dset>>
size: [2] [2]
position integer1 of </dset> integer1 of </dset> difference
------------------------------------------------------------
[ 0 ] 1 2 1
[ 1 ] 2 3 1
2 differences found
2 differences found
group : </g> and </g>
0 differences found
obj1 obj2
--------------------------------------
x x float1
x x integer1
Attributes status: 2 common, 0 only in obj1, 0 only in obj2
attribute: <float1 of </g>> and <float1 of </g>>
size: [2] [2]
position float1 of </g> float1 of </g> difference
------------------------------------------------------------
[ 0 ] 1.1 2.1 1
[ 1 ] 2.2 3.2 1
2 differences found
attribute: <integer1 of </g>> and <integer1 of </g>>
size: [2] [2]
position integer1 of </g> integer1 of </g> difference
------------------------------------------------------------
[ 0 ] 1 2 1
[ 1 ] 2 3 1
2 differences found
group : </g2> and </g2>
0 differences found
obj1 obj2
--------------------------------------
x x float2
x float3
x x integer1
Attributes status: 2 common, 1 only in obj1, 0 only in obj2
attribute: <float2 of </g2>> and <float2 of </g2>>
size: [2] [2]
position float2 of </g2> float2 of </g2> difference
------------------------------------------------------------
[ 0 ] 1.1 2.1 1
[ 1 ] 2.2 3.2 1
2 differences found
attribute: <integer1 of </g2>> and <integer1 of </g2>>
size: [2] [2]
position integer1 of </g2> integer1 of </g2> difference
------------------------------------------------------------
[ 0 ] 1 2 1
[ 1 ] 2 3 1
2 differences found
group : </g3> and </g3>
0 differences found
obj1 obj2
--------------------------------------
x float11
x float12
x float4
x integer10
x integer3
Attributes status: 0 common, 3 only in obj1, 2 only in obj2
group : </g4> and </g4>
0 differences found
obj1 obj2
--------------------------------------
Attributes status: 0 common, 0 only in obj1, 0 only in obj2
datatype: </ntype> and </ntype>
0 differences found
obj1 obj2
--------------------------------------
x float2
x float3
x float5
x float6
x integer1
x integer4
Attributes status: 0 common, 3 only in obj1, 3 only in obj2
EXIT CODE: 1