diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2007-02-28 16:54:50 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2007-02-28 16:54:50 (GMT) |
commit | c8ba250a1e2db0d4d66705a131841f5cc1c86a2d (patch) | |
tree | 3143dad02fe5398332cd5c1bd8f457d19190f90c /test | |
parent | a9d32e4896e6577a0fa8380632f45b7f82a34fcb (diff) | |
download | hdf5-c8ba250a1e2db0d4d66705a131841f5cc1c86a2d.zip hdf5-c8ba250a1e2db0d4d66705a131841f5cc1c86a2d.tar.gz hdf5-c8ba250a1e2db0d4d66705a131841f5cc1c86a2d.tar.bz2 |
[svn-r13432] Changed the detection of alignment requirement for Direct I/O from configuration to run-time
detection in H5FD_direct_open in H5FDdirect.c.
Diffstat (limited to 'test')
-rw-r--r-- | test/dtypes.c | 2 | ||||
-rw-r--r-- | test/vfd.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/test/dtypes.c b/test/dtypes.c index fba910b..e32a0a9 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -1965,7 +1965,7 @@ test_compound_11(void) for(u=0; u<NTESTELEM; u++) { ((big_t *)buf)[u].d1=(double)u*(double)1.5; ((big_t *)buf)[u].d2=(double)u*(double)2.5; - ((big_t *)buf)[u].d2=(double)u*(double)3.5; + ((big_t *)buf)[u].d3=(double)u*(double)3.5; ((big_t *)buf)[u].i1=u*3; ((big_t *)buf)[u].i2=u*5; ((big_t *)buf)[u].s1=HDmalloc(32); @@ -215,7 +215,6 @@ test_direct(void) if(file_size<1*KB || file_size>4*KB) TEST_ERROR; -#ifdef H5_HAVE_DIRECT_ALIGN /* Allocate aligned memory for data set 1. For data set 1, everything is aligned including * memory address, size of data, and file address. */ if(posix_memalign(&points, (size_t)FBSIZE, (size_t)(DSET1_DIM1*DSET1_DIM2*sizeof(int)))!=0) @@ -223,11 +222,6 @@ test_direct(void) if(posix_memalign(&check, (size_t)FBSIZE, (size_t)(DSET1_DIM1*DSET1_DIM2*sizeof(int)))!=0) TEST_ERROR; -#else - /* Allocate aligned memory for data set 1. No need for alignment. */ - points=(int*)malloc(DSET1_DIM1*DSET1_DIM2*sizeof(int)); - check=(int*)malloc(DSET1_DIM1*DSET1_DIM2*sizeof(int)); -#endif /* Initialize the dset1 */ p1 = points; |