diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/fheap.c | 75 | ||||
| -rw-r--r-- | test/ntypes.c | 21 | ||||
| -rw-r--r-- | test/tvlstr.c | 21 | ||||
| -rw-r--r-- | test/vfd_swmr.c | 6 | ||||
| -rw-r--r-- | test/vfd_swmr_bigset_writer.c | 2 | ||||
| -rw-r--r-- | test/vfd_swmr_common.c | 6 | ||||
| -rw-r--r-- | test/vfd_swmr_common.h | 4 | ||||
| -rw-r--r-- | test/vfd_swmr_group_writer.c | 2 | ||||
| -rw-r--r-- | test/vfd_swmr_vlstr_reader.c | 2 |
9 files changed, 77 insertions, 62 deletions
diff --git a/test/fheap.c b/test/fheap.c index 2eb0372..2c888a2 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -80,8 +80,9 @@ #define IBLOCK_MAX_DROWS(fh, pos) \ H5HF_get_iblock_max_drows_test(fh, pos) /* Max. # of direct block rows in a indirect block */ #define DBLOCK_SIZE(fh, r) H5HF_get_dblock_size_test(fh, r) /* Size of a direct block in a given row */ -#define DBLOCK_FREE(fh, r) H5HF_get_dblock_free_test(fh, r) /* Free space in a direct block of a given row \ - */ +#define DBLOCK_FREE(fh, r) \ + H5HF_get_dblock_free_test(fh, r) /* Free space in a direct block of a given row \ + */ /* The number of settings for testing: page buffering, file space strategy and persisting free-space */ #define NUM_PB_FS 6 @@ -8467,10 +8468,10 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test h5_stat_size_t empty_size; /* Size of a file with an empty heap */ size_t obj_size; /* Size of object */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "skipping starting block, then adding object back to first block, then remove all objects %s"; /* Test - description - */ + const char *base_desc = "skipping starting block, then adding object back to first block, then remove " + "all objects %s"; /* Test + description + */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, NULL) < 0) @@ -8919,11 +8920,11 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t * size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "skipping blocks with indirect root, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u; /* Local index variable */ + const char *base_desc = "skipping blocks with indirect root, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u; /* Local index variable */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -9086,10 +9087,10 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling first row, then skipping rows, then backfill and extend, then remove all objects %s"; /* Test - description - */ + const char *base_desc = "filling first row, then skipping rows, then backfill and extend, then remove " + "all objects %s"; /* Test + description + */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -9600,12 +9601,13 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_ size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling direct blocks, filling 2nd level indirect blocks, except last one, and insert object too " - "large for 2nd level indirect blocks, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u; /* Local index variables */ + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, except last one, and " + "insert object too " + "large for 2nd level indirect blocks, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -10854,12 +10856,12 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char - *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd " - "level indirect blocks, except last one, fill all direct blocks in last 3rd level " - "indirect block, and insert object too large for it's 2nd level indirect blocks, then " - "backfill and extend, then remove all objects %s"; /* Test description */ - unsigned u, v; /* Local index variables */ + const char * base_desc = + "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd " + "level indirect blocks, except last one, fill all direct blocks in last 3rd level " + "indirect block, and insert object too large for it's 2nd level indirect blocks, then " + "backfill and extend, then remove all objects %s"; /* Test description */ + unsigned u, v; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) @@ -11764,14 +11766,17 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star size_t obj_size; /* Size of object */ size_t fill_size; /* Size of objects for "bulk" filled blocks */ fheap_heap_state_t state; /* State of fractal heap */ - const char * base_desc = - "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill " - "first row of 3rd level indirect blocks in 4th level indirect block except last 3rd level block, " - "fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect " - "block's 3rd level indirect block, then backfill and extend, then remove all objects %s"; /* Test - description - */ - unsigned u, v; /* Local index variables */ + const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level " + "indirect blocks, fill " + "first row of 3rd level indirect blocks in 4th level indirect block except last " + "3rd level block, " + "fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of " + "4th level indirect " + "block's 3rd level indirect block, then backfill and extend, then remove all " + "objects %s"; /* Test + description + */ + unsigned u, v; /* Local index variables */ /* Perform common test initialization operations */ if (begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0) diff --git a/test/ntypes.c b/test/ntypes.c index fc69382..0235c60 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -1993,14 +1993,19 @@ error: static herr_t test_vlstr_dtype(hid_t file) { - const char *wdata[SPACE1_DIM1] = { - "Four score and seven years ago our forefathers brought forth on this continent a new nation,", - "conceived in liberty and dedicated to the proposition that all men are created equal.", - "Now we are engaged in a great civil war,", - "testing whether that nation or any nation so conceived and so dedicated can long endure."}; /* Information - to - write - */ + const char + * + wdata[SPACE1_DIM1] = + { + "Four score and seven years ago our forefathers brought forth on this continent a new " + "nation,", + "conceived in liberty and dedicated to the proposition that all men are created equal.", + "Now we are engaged in a great civil war,", + "testing whether that nation or any nation so conceived and so dedicated can long " + "endure."}; /* Information + to + write + */ char * rdata[SPACE1_DIM1]; /* Information read in */ hbool_t rdata_alloc = FALSE; /* Whether the read data is allocated */ hid_t dataset = -1; /* Dataset ID */ diff --git a/test/tvlstr.c b/test/tvlstr.c index e4c33f6..091dd77 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -110,14 +110,19 @@ test_vlstr_free_custom(void *_mem, void *info) static void test_vlstrings_basic(void) { - const char *wdata[SPACE1_DIM1] = { - "Four score and seven years ago our forefathers brought forth on this continent a new nation,", - "conceived in liberty and dedicated to the proposition that all men are created equal.", - "Now we are engaged in a great civil war,", - "testing whether that nation or any nation so conceived and so dedicated can long endure."}; /* Information - to - write - */ + const char + * + wdata[SPACE1_DIM1] = + { + "Four score and seven years ago our forefathers brought forth on this continent a new " + "nation,", + "conceived in liberty and dedicated to the proposition that all men are created equal.", + "Now we are engaged in a great civil war,", + "testing whether that nation or any nation so conceived and so dedicated can long " + "endure."}; /* Information + to + write + */ char * rdata[SPACE1_DIM1]; /* Information read in */ char * wdata2; hid_t dataspace, dataset2; diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c index 0910409..9c5899e 100644 --- a/test/vfd_swmr.c +++ b/test/vfd_swmr.c @@ -3494,9 +3494,9 @@ main(void) nerrors += test_file_fapl(); #ifndef H5_HAVE_WIN32_API -/* XXX: VFD SWMR: Fails on Win32 due to problems unlinking the metadata file. - * The OS claims another process is using the file. - */ + /* XXX: VFD SWMR: Fails on Win32 due to problems unlinking the metadata file. + * The OS claims another process is using the file. + */ nerrors += test_writer_create_open_flush(); nerrors += test_writer_md(); #endif diff --git a/test/vfd_swmr_bigset_writer.c b/test/vfd_swmr_bigset_writer.c index a3653d5..614a499 100644 --- a/test/vfd_swmr_bigset_writer.c +++ b/test/vfd_swmr_bigset_writer.c @@ -692,7 +692,7 @@ open_extensible_dset(state_t *s, unsigned int which) for (i = 0; i < tries; i++) { struct timespec one_tenth = {.tv_sec = 0, .tv_nsec = 1000000000L / 10}; - ds = H5Dopen(s->file[0], dname, s->dapl); + ds = H5Dopen2(s->file[0], dname, s->dapl); if (ds >= 0) break; diff --git a/test/vfd_swmr_common.c b/test/vfd_swmr_common.c index 93abe60..dad9e3d 100644 --- a/test/vfd_swmr_common.c +++ b/test/vfd_swmr_common.c @@ -126,7 +126,7 @@ disable_estack(void) { estack_state_t es = estack_get_state(); - (void)H5Eset_auto(H5E_DEFAULT, NULL, NULL); + (void)H5Eset_auto2(H5E_DEFAULT, NULL, NULL); return es; } @@ -137,7 +137,7 @@ estack_get_state(void) { estack_state_t es; - (void)H5Eget_auto(H5E_DEFAULT, &es.efunc, &es.edata); + (void)H5Eget_auto2(H5E_DEFAULT, &es.efunc, &es.edata); return es; } @@ -148,7 +148,7 @@ estack_get_state(void) void restore_estack(estack_state_t es) { - (void)H5Eset_auto(H5E_DEFAULT, es.efunc, es.edata); + (void)H5Eset_auto2(H5E_DEFAULT, es.efunc, es.edata); } #ifndef H5_HAVE_WIN32_API diff --git a/test/vfd_swmr_common.h b/test/vfd_swmr_common.h index 9a51b6d..e70c316 100644 --- a/test/vfd_swmr_common.h +++ b/test/vfd_swmr_common.h @@ -38,8 +38,8 @@ /************/ typedef struct _estack_state { - H5E_auto_t efunc; - void * edata; + H5E_auto2_t efunc; + void * edata; } estack_state_t; typedef enum _testsel { TEST_NONE = 0, TEST_NULL, TEST_OOB } testsel_t; diff --git a/test/vfd_swmr_group_writer.c b/test/vfd_swmr_group_writer.c index aa87b72f..1c309e1 100644 --- a/test/vfd_swmr_group_writer.c +++ b/test/vfd_swmr_group_writer.c @@ -228,7 +228,7 @@ verify_group(state_t *s, unsigned int which) esnprintf(name, sizeof(name), "/group-%d", which); es = disable_estack(); - g = H5Gopen(s->file, name, H5P_DEFAULT); + g = H5Gopen2(s->file, name, H5P_DEFAULT); restore_estack(es); if (g < 0) diff --git a/test/vfd_swmr_vlstr_reader.c b/test/vfd_swmr_vlstr_reader.c index 029dc50..226c0a8 100644 --- a/test/vfd_swmr_vlstr_reader.c +++ b/test/vfd_swmr_vlstr_reader.c @@ -171,7 +171,7 @@ main(int argc, char **argv) dbgf(2, "iteration %d which %d", i, which); (void)snprintf(name[which], sizeof(name[which]), "dset-%d", which); es = disable_estack(); - dset[which] = H5Dopen(fid, name[which], H5P_DEFAULT); + dset[which] = H5Dopen2(fid, name[which], H5P_DEFAULT); restore_estack(es); if (caught_out_of_bounds || dset[which] == badhid) { dbgf(2, ": couldn't open\n"); |