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

[svn-r22176] Purpose:

Browse Source 
Fix for HDFFV-7644 GMQS: h5diff - incorrect behaviors when comparing HDF5 files with different type of objects (dataset, group, type) as common objects

Description:
  Fixed failure for comparing same named object with different object types in comparing groups. (common object comparison)
  Prior to the fix, h5diff resulted in error. After the fix, h5diff detects such case as non-comparable and display messages accordingly.
  Test cases were added and tagged with jira#.

Tested:
  jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE),  Windows (32-LE cmake), Cmake (jam)
This commit is contained in:
Jonathan Kim
2012-03-28 17:09:38 -05:00
parent d4ab4456d0
commit 6cef6bca1f
20 changed files with 316 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/h5diff/testfiles/h5diff_20.txt
View File

@@ -1,4 +1,4 @@
</dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP
Not comparable: </dset> is of type H5G_DATASET and </g1> is of type H5G_GROUP
--------------------------------
Some objects are not comparable
--------------------------------

2
tools/h5diff/testfiles/h5diff_21.txt
View File

@@ -1,4 +1,4 @@
</dset> is of type H5G_DATASET and </l1> is of type H5G_LINK
Not comparable: </dset> is of type H5G_DATASET and </l1> is of type H5G_LINK
--------------------------------
Some objects are not comparable
--------------------------------

2
tools/h5diff/testfiles/h5diff_22.txt
View File

@@ -1,4 +1,4 @@
</dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE
Not comparable: </dset> is of type H5G_DATASET and </t1> is of type H5G_TYPE
--------------------------------
Some objects are not comparable
--------------------------------

3
tools/h5diff/testfiles/h5diff_222.txt
View File

@@ -1,3 +1,6 @@
Not comparable: </diffobjtypes/obj1> is of type H5G_DATASET and </diffobjtypes/obj1> is of type H5G_GROUP
Not comparable: </diffobjtypes/obj2> is of type H5G_GROUP and </diffobjtypes/obj2> is of type H5G_TYPE
Not comparable: </diffobjtypes/obj3> is of type H5G_TYPE and </diffobjtypes/obj3> is of type H5G_DATASET
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

4
tools/h5diff/testfiles/h5diff_223.txt Normal file
View File

@@ -0,0 +1,4 @@
Not comparable: </diffobjtypes/obj1> is of type H5G_DATASET and </diffobjtypes/obj1> is of type H5G_GROUP
Not comparable: </diffobjtypes/obj2> is of type H5G_GROUP and </diffobjtypes/obj2> is of type H5G_TYPE
Not comparable: </diffobjtypes/obj3> is of type H5G_TYPE and </diffobjtypes/obj3> is of type H5G_DATASET
EXIT CODE: 0

4
tools/h5diff/testfiles/h5diff_224.txt Normal file
View File

@@ -0,0 +1,4 @@
Not comparable: </diffobjtypes/obj1> is of type H5G_GROUP and </diffobjtypes/obj1> is of type H5G_DATASET
Not comparable: </diffobjtypes/obj2> is of type H5G_TYPE and </diffobjtypes/obj2> is of type H5G_GROUP
Not comparable: </diffobjtypes/obj3> is of type H5G_DATASET and </diffobjtypes/obj3> is of type H5G_TYPE
EXIT CODE: 0

2
tools/h5diff/testfiles/h5diff_505.txt
View File

@@ -1,4 +1,4 @@
</grp1> is of type H5G_GROUP and </slink_grp1> is of type H5G_LINK
Not comparable: </grp1> is of type H5G_GROUP and </slink_grp1> is of type H5G_LINK
--------------------------------
Some objects are not comparable
--------------------------------

2
tools/h5diff/testfiles/h5diff_507.txt
View File

@@ -1,4 +1,4 @@
</grp1> is of type H5G_GROUP and </elink_grp1> is of type H5G_UDLINK
Not comparable: </grp1> is of type H5G_GROUP and </elink_grp1> is of type H5G_UDLINK
--------------------------------
Some objects are not comparable
--------------------------------

2
tools/h5diff/testfiles/h5diff_509.txt
View File

@@ -1,4 +1,4 @@
</slink_grp1> is of type H5G_LINK and </elink_grp1> is of type H5G_UDLINK
Not comparable: </slink_grp1> is of type H5G_LINK and </elink_grp1> is of type H5G_UDLINK
--------------------------------
Some objects are not comparable
--------------------------------

7
tools/h5diff/testfiles/h5diff_515.txt
View File

@@ -17,8 +17,11 @@ dataset: </dset1> and </dset1>
0 differences found
group : </g1> and </g1>
0 differences found
group : </g1/g2> and </g1/g2>
0 differences found
Not comparable: </g1/g2> is of type H5G_GROUP and </g1/g2> is of type H5G_UDLINK
link : </soft_dset1> and </soft_dset1>
0 differences found
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.
EXIT CODE: 1

7
tools/h5diff/testfiles/h5diff_517.txt
View File

@@ -10,6 +10,9 @@ group1 group2
group : </g1> and </g1>
0 differences found
group : </g1/g2> and </g1/g2>
0 differences found
Not comparable: </g1/g2> is of type H5G_GROUP and </g1/g2> is of type H5G_UDLINK
--------------------------------
Some objects are not comparable
--------------------------------
Use -c for a list of objects without details of differences.
EXIT CODE: 1

BIN
tools/h5diff/testfiles/non_comparables1.h5
View File

Binary file not shown.

BIN
tools/h5diff/testfiles/non_comparables2.h5
View File

Binary file not shown.