diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 21:50:13 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-10-24 21:50:13 (GMT) |
| commit | e54d15a26ca33a093730861b517604b9305faf67 (patch) | |
| tree | 2f753d7c84b9d656a6228b9c2c8f499f0f51d447 /tools/h5diff/testfiles | |
| parent | 1dcc75407eb48ebe0ffa3ff35087bbcb4a96c3a7 (diff) | |
| download | hdf5-e54d15a26ca33a093730861b517604b9305faf67.zip hdf5-e54d15a26ca33a093730861b517604b9305faf67.tar.gz hdf5-e54d15a26ca33a093730861b517604b9305faf67.tar.bz2 | |
[svn-r21658] 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.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows, Cmake
Diffstat (limited to 'tools/h5diff/testfiles')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_221.txt | 6 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_222.txt | 6 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/non_comparables1.h5 | bin | 6408 -> 6568 bytes | |||
| -rw-r--r-- | tools/h5diff/testfiles/non_comparables2.h5 | bin | 6408 -> 6584 bytes |
4 files changed, 10 insertions, 2 deletions
diff --git a/tools/h5diff/testfiles/h5diff_221.txt b/tools/h5diff/testfiles/h5diff_221.txt index 8f90300..621f5c3 100644 --- a/tools/h5diff/testfiles/h5diff_221.txt +++ b/tools/h5diff/testfiles/h5diff_221.txt @@ -1,5 +1,9 @@ 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 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 diff --git a/tools/h5diff/testfiles/non_comparables1.h5 b/tools/h5diff/testfiles/non_comparables1.h5 Binary files differindex 3aa5199..71b65c8 100644 --- a/tools/h5diff/testfiles/non_comparables1.h5 +++ b/tools/h5diff/testfiles/non_comparables1.h5 diff --git a/tools/h5diff/testfiles/non_comparables2.h5 b/tools/h5diff/testfiles/non_comparables2.h5 Binary files differindex d860625..188ceb9 100644 --- a/tools/h5diff/testfiles/non_comparables2.h5 +++ b/tools/h5diff/testfiles/non_comparables2.h5 |