diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-02-11 16:37:46 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-02-11 16:37:46 (GMT) |
| commit | 8fd5f783b4305485cb1293a90eaaf526e7882e78 (patch) | |
| tree | d04301f9c221d6762170fd585518f526c46fa7a3 /tools/h5diff/testfiles | |
| parent | c4a18e8ac7c3338281cc5e00fe6a63855838f00a (diff) | |
| download | hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.zip hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.tar.gz hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.tar.bz2 | |
[svn-r16463] merge from trunk
Bug fix: for compound types, the not comparable test for members was not done
Solution: for compound types, recursively apply that check
Two new cases are added
1) the compound type has a different number of members. Message printed is
<obj1> has X members <obj2> has Y members
Where X and Y are the number of members of each compound type being compared
2) the compound type has not comparable types (for example a double and an int at the same index)
In this case the message
Comparison not possible: object1 is of class1 and object2 is of class2
Is replaced with
Comparison not possible: object1 has a class1 and object2 has a class2
Modified the test generator program to have these 2 cases
Added a shell run for these 2 cases
Tested: h5committest
Diffstat (limited to 'tools/h5diff/testfiles')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_17.txt | 3 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_206.txt | 1 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_207.txt | 2 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_90.txt | 10 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_basic2.h5 | bin | 7688 -> 9008 bytes |
5 files changed, 16 insertions, 0 deletions
diff --git a/tools/h5diff/testfiles/h5diff_17.txt b/tools/h5diff/testfiles/h5diff_17.txt index 2ffbda9..ac04bd4 100644 --- a/tools/h5diff/testfiles/h5diff_17.txt +++ b/tools/h5diff/testfiles/h5diff_17.txt @@ -29,6 +29,9 @@ file1 file2 x /g2/dset4 x /g2/dset5 x /g2/dset6 + x /g2/dset7 + x /g2/dset8 + x /g2/dset9 group : </> and </> 0 differences found diff --git a/tools/h5diff/testfiles/h5diff_206.txt b/tools/h5diff/testfiles/h5diff_206.txt new file mode 100644 index 0000000..8bbbb9a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_206.txt @@ -0,0 +1 @@ +</g2/dset7> has a class H5T_FLOAT and </g2/dset8> has a class H5T_INTEGER diff --git a/tools/h5diff/testfiles/h5diff_207.txt b/tools/h5diff/testfiles/h5diff_207.txt new file mode 100644 index 0000000..833afe8 --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_207.txt @@ -0,0 +1,2 @@ +</g2/dset8> or </g2/dset9> are empty datasets +</g2/dset8> has 2 members </g2/dset9> has 1 members diff --git a/tools/h5diff/testfiles/h5diff_90.txt b/tools/h5diff/testfiles/h5diff_90.txt index cfef527..71b960e 100644 --- a/tools/h5diff/testfiles/h5diff_90.txt +++ b/tools/h5diff/testfiles/h5diff_90.txt @@ -13,6 +13,9 @@ file1 file2 x x /g2/dset4 x x /g2/dset5 x x /g2/dset6 + x x /g2/dset7 + x x /g2/dset8 + x x /g2/dset9 group : </> and </> 0 differences found @@ -39,6 +42,13 @@ dataset: </g2/dset5> and </g2/dset5> 0 differences found dataset: </g2/dset6> and </g2/dset6> 0 differences found +dataset: </g2/dset7> and </g2/dset7> +0 differences found +dataset: </g2/dset8> and </g2/dset8> +0 differences found +dataset: </g2/dset9> and </g2/dset9> +</g2/dset9> or </g2/dset9> are empty datasets +0 differences found -------------------------------- Some objects are not comparable -------------------------------- diff --git a/tools/h5diff/testfiles/h5diff_basic2.h5 b/tools/h5diff/testfiles/h5diff_basic2.h5 Binary files differindex 952a2e9..f3d6be8 100644 --- a/tools/h5diff/testfiles/h5diff_basic2.h5 +++ b/tools/h5diff/testfiles/h5diff_basic2.h5 |