diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-26 15:42:14 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-26 15:42:14 (GMT) |
| commit | c5dc74de1583e40affee0ebef1749d0e7b0d94ba (patch) | |
| tree | 5e161dc411fff0d4cef1959f0479b446cde301b3 | |
| parent | b9b6d2afb6ddf49793571c0a3f3a699ce07c7da5 (diff) | |
| download | hdf5-c5dc74de1583e40affee0ebef1749d0e7b0d94ba.zip hdf5-c5dc74de1583e40affee0ebef1749d0e7b0d94ba.tar.gz hdf5-c5dc74de1583e40affee0ebef1749d0e7b0d94ba.tar.bz2 | |
[svn-r12303] Purpose:
new feature
Description:
modified the test case for region points, so that there is not an ordered sequence of points that differ, but one with gaps
Solution:
Platforms tested:
linux
Misc. update:
| -rw-r--r-- | tools/h5diff/h5diffgentest.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 2 | ||||
| -rw-r--r-- | tools/testfiles/file7.h5 | bin | 20768 -> 20768 bytes | |||
| -rw-r--r-- | tools/testfiles/file8.h5 | bin | 20768 -> 20768 bytes | |||
| -rw-r--r-- | tools/testfiles/h5diff_58.txt | 4 | ||||
| -rw-r--r-- | tools/testfiles/h5diff_80.txt | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index c99c8df..029e694 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -404,9 +404,9 @@ void gen_datareg(hid_t fid, coord[4][0]=2; coord[4][1]=8; if (make_diffs) { - coord[0][0]=5; coord[0][1]=8; coord[1][0]=3; coord[1][1]=3; - coord[2][0]=7; coord[2][1]=5; + coord[3][0]=2; coord[3][1]=5; + coord[4][0]=1; coord[4][1]=7; } H5Sselect_elements(sid1,H5S_SELECT_SET,5,(const hsize_t **)coord); H5Sget_select_npoints(sid1); diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index abf1f74..814a5d7 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -1787,7 +1787,7 @@ hsize_t diff_region(hid_t obj1_id, hsize_t *ptdata2; int ndims1; int ndims2; - int i, j, ret; + int i, j; haddr_t objno1, objno2; /* compact form of object's location */ hsize_t nfound_b=0; /* block differences found */ hsize_t nfound_p=0; /* point differences found */ diff --git a/tools/testfiles/file7.h5 b/tools/testfiles/file7.h5 Binary files differindex 4b6aa3c..69714b1 100644 --- a/tools/testfiles/file7.h5 +++ b/tools/testfiles/file7.h5 diff --git a/tools/testfiles/file8.h5 b/tools/testfiles/file8.h5 Binary files differindex 1229ea7..b6fbcb9 100644 --- a/tools/testfiles/file8.h5 +++ b/tools/testfiles/file8.h5 diff --git a/tools/testfiles/h5diff_58.txt b/tools/testfiles/h5diff_58.txt index e03c765..2ef832a 100644 --- a/tools/testfiles/h5diff_58.txt +++ b/tools/testfiles/h5diff_58.txt @@ -7,7 +7,7 @@ Referenced dataset 5888 5888 Region blocks block #0 (2,2)-(7,7) (0,0)-(2,2) Region points -point #0 (6,9) (5,8) point #1 (2,2) (3,3) -point #2 (8,4) (7,5) +point #3 (1,6) (2,5) +point #4 (2,8) (1,7) 4 differences found diff --git a/tools/testfiles/h5diff_80.txt b/tools/testfiles/h5diff_80.txt index 2e0c6ac..d856c73 100644 --- a/tools/testfiles/h5diff_80.txt +++ b/tools/testfiles/h5diff_80.txt @@ -720,9 +720,9 @@ Referenced dataset 5888 5888 Region blocks block #0 (2,2)-(7,7) (0,0)-(2,2) Region points -point #0 (6,9) (5,8) point #1 (2,2) (3,3) -point #2 (8,4) (7,5) +point #3 (1,6) (2,5) +point #4 (2,8) (1,7) 4 differences found Group: </> and </> 0 differences found |