mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[svn-r12443] Purpose:
Added/adjusted Test Express mode. Description: btree2: Added TestExpress mode to skip some long tests (the 5th recursive and the two random tests.) fheap: Changed the express mode messages to be more informative. Un-excluded some tests from express mode. Platforms tested: Red Storm.
This commit is contained in:
parent
b2acb3e736
commit
95a106f9fd
@ -5575,10 +5575,14 @@ main(void)
|
||||
{
|
||||
hid_t fapl = -1; /* File access property list for data files */
|
||||
unsigned nerrors = 0; /* Cumulative error count */
|
||||
int ExpressMode;
|
||||
|
||||
/* Reset library */
|
||||
h5_reset();
|
||||
fapl = h5_fileaccess();
|
||||
ExpressMode = GetTestExpress();
|
||||
if (ExpressMode > 1)
|
||||
printf("***Express test mode on. Some tests may be skipped\n");
|
||||
|
||||
/* Test B-tree record insertion */
|
||||
/* Iteration, find & index routines tested in these routines as well */
|
||||
@ -5595,7 +5599,10 @@ main(void)
|
||||
nerrors += test_insert_level2_2internal_split(fapl);
|
||||
nerrors += test_insert_level2_3internal_redistrib(fapl);
|
||||
nerrors += test_insert_level2_3internal_split(fapl);
|
||||
nerrors += test_insert_lots(fapl);
|
||||
if (ExpressMode > 1)
|
||||
printf("***Express test mode on. test_insert_lots skipped\n");
|
||||
else
|
||||
nerrors += test_insert_lots(fapl);
|
||||
|
||||
/* Test B-tree record removal */
|
||||
/* Querying the number of records routine also tested in these routines as well */
|
||||
@ -5619,7 +5626,10 @@ main(void)
|
||||
nerrors += test_remove_level2_2internal_merge_right(fapl);
|
||||
nerrors += test_remove_level2_3internal_merge(fapl);
|
||||
nerrors += test_remove_level2_collapse_right(fapl);
|
||||
nerrors += test_remove_lots(fapl);
|
||||
if (ExpressMode > 1)
|
||||
printf("***Express test mode on. test_remove_lots skipped\n");
|
||||
else
|
||||
nerrors += test_remove_lots(fapl);
|
||||
|
||||
/* Test more complex B-tree queries */
|
||||
nerrors += test_find_neighbor(fapl);
|
||||
|
58
test/fheap.c
58
test/fheap.c
@ -13162,45 +13162,41 @@ curr_test = FHEAP_TEST_REOPEN;
|
||||
*/
|
||||
#ifndef QAK
|
||||
if (ExpressMode > 1)
|
||||
printf("***Express test mode on. Some tests skipped\n");
|
||||
printf("***Express test mode on. test_abs_start_5th_recursive_indirect is skipped\n");
|
||||
else
|
||||
nerrors += test_abs_start_5th_recursive_indirect(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_start_5th_recursive_indirect(fapl, &cparam, &tparam);
|
||||
#else /* QAK */
|
||||
HDfprintf(stderr, "Uncomment tests!\n");
|
||||
#endif /* QAK */
|
||||
|
||||
#ifndef QAK
|
||||
/* Skip blocks insertion */
|
||||
if (ExpressMode > 1)
|
||||
printf("***Express test mode on. Some tests skipped\n");
|
||||
else {
|
||||
nerrors += test_abs_skip_start_block(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_start_block_add_back(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_2nd_block(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_one_partial_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_row_skip_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_indirect_two_rows_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_start_block(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_start_block_add_back(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_2nd_block(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_one_partial_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_row_skip_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_direct_skip_indirect_two_rows_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
nerrors += test_abs_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(fapl, &cparam, &tparam);
|
||||
|
||||
/* Additional skipped block insertion tests */
|
||||
nerrors += test_abs_skip_direct_skip_indirect_two_rows_add_skipped(fapl, &cparam, &tparam);
|
||||
} /* end else */
|
||||
/* Additional skipped block insertion tests */
|
||||
nerrors += test_abs_skip_direct_skip_indirect_two_rows_add_skipped(fapl, &cparam, &tparam);
|
||||
#else /* QAK */
|
||||
HDfprintf(stderr, "Uncomment tests!\n");
|
||||
#endif /* QAK */
|
||||
|
Loading…
Reference in New Issue
Block a user