diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-23 05:03:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-23 05:03:00 (GMT) |
| commit | b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719 (patch) | |
| tree | d6b6205b09360e90e76dffa73854bf288890280f /test/dsets.c | |
| parent | 997392079b023bf366b62c17936d4ec305739be3 (diff) | |
| download | hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.zip hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.tar.gz hdf5-b2d6d68d5dfe5c68cbeb45f30da89d44eaa58719.tar.bz2 | |
[svn-r29770] Description:
Bring 'none' chunk index from revise_chunks branch to trunk.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production (w/check-vfd)
(h5committest forthcoming)
Diffstat (limited to 'test/dsets.c')
| -rw-r--r-- | test/dsets.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/test/dsets.c b/test/dsets.c index 2ff8dda..2bc162c 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -6949,8 +6949,14 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify index type */ if(low == H5F_LIBVER_LATEST) { + if(early_alloc) { + if(idx_type != H5D_CHUNK_IDX_NONE) + FAIL_PUTS_ERROR("should be using Non-Index as index"); + } /* end if */ + else { if(idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using Fixed Array as index"); + } /* end else */ } else if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index"); @@ -7009,7 +7015,7 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify index type */ if(low == H5F_LIBVER_LATEST) { if(early_alloc) { - if(idx_type != H5D_CHUNK_IDX_FARRAY) + if(idx_type != H5D_CHUNK_IDX_NONE) FAIL_PUTS_ERROR("should be using implicit indexing"); } else if(idx_type != H5D_CHUNK_IDX_BT2) FAIL_PUTS_ERROR("should be using v2 B-tree as index"); @@ -7111,8 +7117,14 @@ test_random_chunks_real(const char *testname, hbool_t early_alloc, hid_t fapl) /* Verify index type */ if(low == H5F_LIBVER_LATEST) { + if(early_alloc) { + if(idx_type != H5D_CHUNK_IDX_NONE) + FAIL_PUTS_ERROR("should be using Non-Index as index"); + } /* end if */ + else { if(idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using Fixed Array as index"); + } /* end else */ } else if(idx_type != H5D_CHUNK_IDX_BTREE) FAIL_PUTS_ERROR("should be using v1 B-tree as index"); @@ -9235,6 +9247,8 @@ test_fixed_array(hid_t fapl) && !compress #endif /* H5_HAVE_FILTER_DEFLATE */ ) { + if(idx_type != H5D_CHUNK_IDX_NONE) + FAIL_PUTS_ERROR("should be using Non Index as index"); } else if (idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using Fixed Array as index"); } /* end if */ @@ -9275,6 +9289,8 @@ test_fixed_array(hid_t fapl) && !compress #endif /* H5_HAVE_FILTER_DEFLATE */ ) { + if(idx_type != H5D_CHUNK_IDX_NONE) + FAIL_PUTS_ERROR("should be using Non Index as index"); } else if(idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using Fixed Array as index"); } else { @@ -9313,6 +9329,8 @@ test_fixed_array(hid_t fapl) && !compress #endif /* H5_HAVE_FILTER_DEFLATE */ ) { + if(idx_type != H5D_CHUNK_IDX_NONE) + FAIL_PUTS_ERROR("should be using Non Index as index"); } else if(idx_type != H5D_CHUNK_IDX_FARRAY) FAIL_PUTS_ERROR("should be using Fixed Array as index"); } /* end if */ |