summaryrefslogtreecommitdiffstats
path: root/tools/h5diff/testfiles/h5diff_515.txt
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2012-03-29 16:57:01 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2012-03-29 16:57:01 (GMT)
commit646374e701e5fb7e07274712617af5868859d303 (patch)
treee166ec3e63e00caa02593230c518ec45727cf717 /tools/h5diff/testfiles/h5diff_515.txt
parentb8cb145bdfc10c7b3fcaf7a05bda4605a7d32533 (diff)
downloadhdf5-646374e701e5fb7e07274712617af5868859d303.zip
hdf5-646374e701e5fb7e07274712617af5868859d303.tar.gz
hdf5-646374e701e5fb7e07274712617af5868859d303.tar.bz2
[svn-r22188] Purpose:
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#. Merged from HDF5 trunk 22176. Tested: jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam)
Diffstat (limited to 'tools/h5diff/testfiles/h5diff_515.txt')
-rw-r--r--tools/h5diff/testfiles/h5diff_515.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/h5diff/testfiles/h5diff_515.txt b/tools/h5diff/testfiles/h5diff_515.txt
index 077d463..263441d 100644
--- a/tools/h5diff/testfiles/h5diff_515.txt
+++ b/tools/h5diff/testfiles/h5diff_515.txt
@@ -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