diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2008-06-26 16:18:22 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2008-06-26 16:18:22 (GMT) |
| commit | 11b12d8f962195245f083bbb4d01ea0af0c908b2 (patch) | |
| tree | 81358fcfe71b79f9b58e69a437424ab8e8e9a542 | |
| parent | c3a26ef4023df49a29843c82d47da3b7989de259 (diff) | |
| download | hdf5-11b12d8f962195245f083bbb4d01ea0af0c908b2.zip hdf5-11b12d8f962195245f083bbb4d01ea0af0c908b2.tar.gz hdf5-11b12d8f962195245f083bbb4d01ea0af0c908b2.tar.bz2 | |
[svn-r15284] Fixed bug 1155, added fillval.c back to windows test file, other minor cleanup in fillval.c.
Tested: kagiso
Same fix in trunk: kagiso (parallel), smirom, linew
| -rw-r--r-- | test/fillval.c | 7 | ||||
| -rw-r--r-- | windows/test/checktests.bat | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/fillval.c b/test/fillval.c index 29f37b4..7c72531 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -1513,7 +1513,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Initialize dataspace & hyperslab info */ for(i = 0, nelmts = 1; i < 5; i++) { - hs_size[i] = start_size[i] / 2; + hs_size[i] = (start_size[i] + 1) / 2; hs_offset[i] = 0; hs_stride[i] = 2; nelmts *= hs_size[i]; @@ -1532,7 +1532,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Select elements within file dataspace */ if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, hs_stride, hs_size, NULL) < 0) TEST_ERROR - /* Write to all odd data locations */ + /* Write to all even data locations */ if(H5Dwrite(dset, dtype, mspace, fspace, H5P_DEFAULT, buf) < 0) TEST_ERROR /* Close memory dataspace */ @@ -1741,6 +1741,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, /* Verify the element read in is the fill-value */ if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, fillval) < 0) TEST_ERROR + /* Set the element back to fillval */ + if(H5Dwrite(dset, dtype, mspace, fspace, H5P_DEFAULT, fillval) < 0) TEST_ERROR + /* Release any VL components */ if(H5Dvlen_reclaim(dtype, mspace, H5P_DEFAULT, val_rd) < 0) TEST_ERROR diff --git a/windows/test/checktests.bat b/windows/test/checktests.bat index cb56523..197ab04 100644 --- a/windows/test/checktests.bat +++ b/windows/test/checktests.bat @@ -99,10 +99,7 @@ rem on it for sending parameters. --SJW 9/6/07 call :add_test unlink%2 .\unlink%2\%1
call :add_test big%2 .\big%2\%1
call :add_test mtime%2 .\mtime%2\%1
- rem Teset commented because fillval produces spurious errors sporatically.
- rem There is a bug filed (1155), and we will re-enable it when this is
- rem fixed. -SJW 6/25/08
- rem call :add_test fillval%2 .\fillval%2\%1
+ call :add_test fillval%2 .\fillval%2\%1
call :add_test mount%2 .\mount%2\%1
call :add_test flush1%2 .\flush1%2\%1
call :add_test flush2%2 .\flush2%2\%1
|