diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-30 19:05:39 (GMT) |
| commit | c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b (patch) | |
| tree | a1e316063fb77793ab94ad890f33eb99d0740fc9 /test | |
| parent | 9e9f96879d760850794a191988a205fbf1a3957d (diff) | |
| download | hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.zip hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.gz hdf5-c7cb8e6adc4c980d7e3e83fa06d0ea95a23fb00b.tar.bz2 | |
[svn-r15300] Description:
Bring revisions 15210:15289 from the trunk into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'test')
| -rw-r--r-- | test/fillval.c | 7 | ||||
| -rw-r--r-- | test/ohdr.c | 2 |
2 files changed, 6 insertions, 3 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/test/ohdr.c b/test/ohdr.c index 08fd860..0a25993 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -153,7 +153,7 @@ main(void) */ TESTING("object header overflow in memory"); for(i = 0; i < 40; i++) { - time_new = (i + 1) * 1000 + 1; + time_new = (i + 1) * 1000 + 1000000; if(H5O_msg_create(&oh_loc, H5O_MTIME_ID, 0, 0, &time_new, H5P_DATASET_XFER_DEFAULT) < 0) FAIL_STACK_ERROR } /* end for */ |