diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-04 03:44:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-04 03:44:19 (GMT) |
| commit | c5bfe49ea68cb324f1ed608083de36071bbe2a24 (patch) | |
| tree | a2b22274a30d4723bfe1077553ca2e1c6c5fca88 /test | |
| parent | b490031679f1319e0f7d68683684d5ea6305b88b (diff) | |
| download | hdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.zip hdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.tar.gz hdf5-c5bfe49ea68cb324f1ed608083de36071bbe2a24.tar.bz2 | |
[svn-r19352] Description:
Align w/changes on revise_chunks branch
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug & production
(too minor to require h5committest)
Diffstat (limited to 'test')
| -rw-r--r-- | test/set_extent.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/test/set_extent.c b/test/set_extent.c index 191962d..391407d 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -261,29 +261,25 @@ static int do_ranks( hid_t fapl ) if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR - if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0) - { + if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") printf(" Fill time: %s\n", (ifset ? "H5D_FILL_TIME_IFSET" : "H5D_FILL_TIME_ALLOC")); @@ -297,23 +293,19 @@ static int do_ranks( hid_t fapl ) if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR - if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank1(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 1") goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank2(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2") goto error; } /* end if */ - if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0) - { + if(test_rank3(fapl, dcpl, do_fillvalue, FALSE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 3") goto error; } /* end if */ - if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0) - { + if(test_rank2(fapl, dcpl, do_fillvalue, TRUE) < 0) { DO_RANKS_PRINT_CONFIG("Rank 2 with non-default indexed storage B-tree") goto error; } /* end if */ @@ -363,14 +355,10 @@ static int do_layouts( hid_t fapl ) TESTING("storage layout use"); if (test_layouts( H5D_COMPACT, fapl ) < 0) - { goto error; - } if (test_layouts( H5D_CONTIGUOUS, fapl ) < 0) - { goto error; - } PASSED(); @@ -2728,8 +2716,9 @@ static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, /* Main loop */ for(i=0; i<RAND4_NITER; i++) { + + /* Generate random write buffer */ if(writing && !zero_dim) { - /* Generate random write buffer */ for(j=0; j<dims[0]; j++) for(k=0; k<dims[1]; k++) for(l=0; l<dims[2]; l++) |