diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2010-12-28 19:36:30 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-12-28 19:36:30 (GMT) |
| commit | ab0ad9ff0202411d9a63e34f9925b79b72e6ba69 (patch) | |
| tree | c133e6ae130c6c0463c9a7747d8ea28c6191e7e8 /tools/h5diff/testfiles | |
| parent | 3a581adac60ed35b4488892bd54c3fc32058abc3 (diff) | |
| download | hdf5-ab0ad9ff0202411d9a63e34f9925b79b72e6ba69.zip hdf5-ab0ad9ff0202411d9a63e34f9925b79b72e6ba69.tar.gz hdf5-ab0ad9ff0202411d9a63e34f9925b79b72e6ba69.tar.bz2 | |
[svn-r19893] Purpose:
Bug 2089 - GMQS: h5diff segfault on a compound dataset with fixed length +
vlen string type order
Description:
Merged from HDF5 trunk r19892.
This is fix for the segfault when h5diff compares a compound dataset with
combination of fixed length string types and vlen string types in certain
orders. Optimized vlariable length string handling codes. The fix is
referred from h5dump handling vlen strings.
For testing, several compound datasets were added with various combinations.
Previous failed cases:
- Vlen string, Fixed length string, Vlen string, Fixed length string
- Fixed length string, Fixed length string, Vlen string, Vlen string
- Fixed length string, Vlen string, Fixed length string, Vlen string
Tested:
jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), linew (solaris-BE)
Diffstat (limited to 'tools/h5diff/testfiles')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_530.txt | 28 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 | bin | 8504 -> 18536 bytes |
2 files changed, 26 insertions, 2 deletions
diff --git a/tools/h5diff/testfiles/h5diff_530.txt b/tools/h5diff/testfiles/h5diff_530.txt index 6f7e08f..bd2b435 100644 --- a/tools/h5diff/testfiles/h5diff_530.txt +++ b/tools/h5diff/testfiles/h5diff_530.txt @@ -2,10 +2,34 @@ file1 file2 --------------------------------------- x x / - x x /Compound_dset + x x /Compound_dset1 + x x /Compound_dset2 + x x /Compound_dset3 + x x /Compound_dset4 + x x /Compound_dset5 + x x /Compound_dset6 + x x /Compound_dset7 + x x /Compound_dset8 + x x /Compound_dset9 group : </> and </> 0 differences found -dataset: </Compound_dset> and </Compound_dset> +dataset: </Compound_dset1> and </Compound_dset1> +0 differences found +dataset: </Compound_dset2> and </Compound_dset2> +0 differences found +dataset: </Compound_dset3> and </Compound_dset3> +0 differences found +dataset: </Compound_dset4> and </Compound_dset4> +0 differences found +dataset: </Compound_dset5> and </Compound_dset5> +0 differences found +dataset: </Compound_dset6> and </Compound_dset6> +0 differences found +dataset: </Compound_dset7> and </Compound_dset7> +0 differences found +dataset: </Compound_dset8> and </Compound_dset8> +0 differences found +dataset: </Compound_dset9> and </Compound_dset9> 0 differences found EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 b/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 Binary files differindex 348cfee..dac510f 100644 --- a/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 +++ b/tools/h5diff/testfiles/h5diff_comp_vl_strs.h5 |