summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2008-06-26 15:50:13 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2008-06-26 15:50:13 (GMT)
commita8011f4136e44fd4ce9b7aa137f421f114ab9ebd (patch)
treef26085d04ee90c0623eaf2f80de0d3431565197f
parenta0dbf6ec46a6700a0ffcb00b44bc0c791f60a15c (diff)
downloadhdf5-a8011f4136e44fd4ce9b7aa137f421f114ab9ebd.zip
hdf5-a8011f4136e44fd4ce9b7aa137f421f114ab9ebd.tar.gz
hdf5-a8011f4136e44fd4ce9b7aa137f421f114ab9ebd.tar.bz2
[svn-r15283] Fixed bug 1155, added fillval.c back to windows test file, other minor cleanup in fillval.c.
Tested: kagiso (parallel), smirom, linew
-rw-r--r--test/fillval.c7
-rw-r--r--windows/test/checktests.bat5
2 files changed, 6 insertions, 6 deletions
diff --git a/test/fillval.c b/test/fillval.c
index 29f37b4..e92872a 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 */
@@ -1721,6 +1721,9 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
/* Verify the element read in is the value written out */
if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, buf) < 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