diff options
author | Jonathan Kim <jkm@hdfgroup.org> | 2012-03-22 19:35:41 (GMT) |
---|---|---|
committer | Jonathan Kim <jkm@hdfgroup.org> | 2012-03-22 19:35:41 (GMT) |
commit | b462f48e9b308886b6ed455a4aae7cbf0b8a2749 (patch) | |
tree | c5c70cb10b5e53322bd089ecfa2b422bf70cfe68 /tools/h5diff/testfiles | |
parent | d6f8aa5c53fb890730befcbf985a7fa9aa38c0ec (diff) | |
download | hdf5-b462f48e9b308886b6ed455a4aae7cbf0b8a2749.zip hdf5-b462f48e9b308886b6ed455a4aae7cbf0b8a2749.tar.gz hdf5-b462f48e9b308886b6ed455a4aae7cbf0b8a2749.tar.bz2 |
[svn-r22124] Purpose:
Fix for HDFFV-7837 - h5diff: incorrect behavior with exclude-path option when unique object exist only in one file
Description:
If unique objects exists only in one file and try to exclude
the unique objects with --exclude-path option, h5diff missed
excluding some objects.
Fixed to exclude objects correctly in such case.
Test cases were added and tagged with jira#.
Merged from HDF5 trunk r22114.
Tested:
jam (linux32-LE), koala (linux64-LE), ostrich (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Windows (32-LE cmake), Cmake (jam)
Diffstat (limited to 'tools/h5diff/testfiles')
-rw-r--r-- | tools/h5diff/testfiles/h5diff_485.txt | 11 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_486.txt | 11 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_487.txt | 12 | ||||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_exclude3-1.h5 | bin | 0 -> 4792 bytes | |||
-rw-r--r-- | tools/h5diff/testfiles/h5diff_exclude3-2.h5 | bin | 0 -> 2176 bytes |
5 files changed, 34 insertions, 0 deletions
diff --git a/tools/h5diff/testfiles/h5diff_485.txt b/tools/h5diff/testfiles/h5diff_485.txt new file mode 100644 index 0000000..4175809 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_485.txt @@ -0,0 +1,11 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + +group : </> and </> +0 differences found +dataset: </dset1> and </dset1> +0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_486.txt b/tools/h5diff/testfiles/h5diff_486.txt new file mode 100644 index 0000000..4175809 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_486.txt @@ -0,0 +1,11 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + +group : </> and </> +0 differences found +dataset: </dset1> and </dset1> +0 differences found +EXIT CODE: 0 diff --git a/tools/h5diff/testfiles/h5diff_487.txt b/tools/h5diff/testfiles/h5diff_487.txt new file mode 100644 index 0000000..8555a71 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_487.txt @@ -0,0 +1,12 @@ + +file1 file2 +--------------------------------------- + x x / + x x /dset1 + x /group1 + +group : </> and </> +0 differences found +dataset: </dset1> and </dset1> +0 differences found +EXIT CODE: 1 diff --git a/tools/h5diff/testfiles/h5diff_exclude3-1.h5 b/tools/h5diff/testfiles/h5diff_exclude3-1.h5 Binary files differnew file mode 100644 index 0000000..f9cc83d --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_exclude3-1.h5 diff --git a/tools/h5diff/testfiles/h5diff_exclude3-2.h5 b/tools/h5diff/testfiles/h5diff_exclude3-2.h5 Binary files differnew file mode 100644 index 0000000..f811905 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_exclude3-2.h5 |