diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 22:24:20 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 22:24:20 (GMT) |
| commit | 1fde26b7a5447089ac57b2ffc10f2b535b7999de (patch) | |
| tree | d6663401ce4b73e4a242d92fce0d25e7dd303a13 /tools/h5diff/testfiles/h5diff_222.txt | |
| parent | c7fe0c67adc04b108204af25c60449352b3a8e6b (diff) | |
| download | hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.zip hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.tar.gz hdf5-1fde26b7a5447089ac57b2ffc10f2b535b7999de.tar.bz2 | |
[svn-r21660] Purpose:
HDFFV-7770 - h5diff segmentation fault on JPSS files
Description:
Fixed segfault over non-comparable attribute with different dimention or
rank, along with '-c' option to display details.
Merged from HDF5 trunk r21658.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows, Cmake
Diffstat (limited to 'tools/h5diff/testfiles/h5diff_222.txt')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_222.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/h5diff/testfiles/h5diff_222.txt b/tools/h5diff/testfiles/h5diff_222.txt index 6e1bbd4..bdecb8a 100644 --- a/tools/h5diff/testfiles/h5diff_222.txt +++ b/tools/h5diff/testfiles/h5diff_222.txt @@ -6,7 +6,11 @@ dataset: </g1/dset1> and </g1/dset1> 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>> +Not comparable: <attr2> has rank 1, dimensions [3], max dimensions [3] +and <attr2> has rank 1, dimensions [4], max dimensions [4] +Not comparable: <attr3> has rank 1, dimensions [3], max dimensions [3] +and <attr3> has rank 2, dimensions [3x1], max dimensions [3x1] +attribute: <attr4 of </g2/dset1>> and <attr4 of </g2/dset1>> 3 differences found dataset: </g2/dset1> and </g2/dset1> 6 differences found |