Latest update.
This commit is contained in:
+159
-20
@@ -21,6 +21,7 @@
|
||||
# define strdup _strdup
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Declares the structures needed to register each test case function.
|
||||
*/
|
||||
@@ -36,14 +37,21 @@ typedef struct test_info {
|
||||
|
||||
static TEST_INFO all_tests[1024];
|
||||
static int num_tests = 0;
|
||||
static int show_list = 0;
|
||||
static int single_test = -1;
|
||||
static int single_iter = -1;
|
||||
static int level = 0;
|
||||
static int seed = 0;
|
||||
/*
|
||||
* A parameterised tests runs a loop of test cases.
|
||||
* A parameterised test runs a loop of test cases.
|
||||
* |num_test_cases| counts the total number of test cases
|
||||
* across all tests.
|
||||
*/
|
||||
static int num_test_cases = 0;
|
||||
|
||||
static int process_shared_options(void);
|
||||
|
||||
|
||||
void add_test(const char *test_case_name, int (*test_fn) (void))
|
||||
{
|
||||
assert(num_tests != OSSL_NELEM(all_tests));
|
||||
@@ -66,8 +74,6 @@ void add_all_tests(const char *test_case_name, int(*test_fn)(int idx),
|
||||
num_test_cases += num;
|
||||
}
|
||||
|
||||
static int level = 0;
|
||||
|
||||
int subtest_level(void)
|
||||
{
|
||||
return level;
|
||||
@@ -99,21 +105,26 @@ static int gcd(int a, int b)
|
||||
return a;
|
||||
}
|
||||
|
||||
void setup_test_framework(void)
|
||||
static void set_seed(int s)
|
||||
{
|
||||
seed = s;
|
||||
if (seed <= 0)
|
||||
seed = (int)time(NULL);
|
||||
test_printf_stdout("%*s# RAND SEED %d\n", subtest_level(), "", seed);
|
||||
test_flush_stdout();
|
||||
srand(seed);
|
||||
}
|
||||
|
||||
|
||||
int setup_test_framework(int argc, char *argv[])
|
||||
{
|
||||
char *TAP_levels = getenv("HARNESS_OSSL_LEVEL");
|
||||
char *test_seed = getenv("OPENSSL_TEST_RAND_ORDER");
|
||||
char *TAP_levels = getenv("HARNESS_OSSL_LEVEL");
|
||||
|
||||
level = TAP_levels != NULL ? 4 * atoi(TAP_levels) : 0;
|
||||
|
||||
if (test_seed != NULL) {
|
||||
seed = atoi(test_seed);
|
||||
if (seed <= 0)
|
||||
seed = (int)time(NULL);
|
||||
test_printf_stdout("%*s# RAND SEED %d\n", subtest_level(), "", seed);
|
||||
test_flush_stdout();
|
||||
srand(seed);
|
||||
}
|
||||
if (TAP_levels != NULL)
|
||||
level = 4 * atoi(TAP_levels);
|
||||
if (test_seed != NULL)
|
||||
set_seed(atoi(test_seed));
|
||||
|
||||
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
|
||||
if (should_report_leaks()) {
|
||||
@@ -121,8 +132,115 @@ void setup_test_framework(void)
|
||||
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
|
||||
}
|
||||
#endif
|
||||
if (!opt_init(argc, argv, test_get_options()))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This can only be called after setup() has run, since num_tests and
|
||||
* all_tests[] are setup at this point
|
||||
*/
|
||||
static int check_single_test_params(char *name, char *testname, char *itname)
|
||||
{
|
||||
if (name != NULL) {
|
||||
int i;
|
||||
for (i = 0; i < num_tests; ++i) {
|
||||
if (strcmp(name, all_tests[i].test_case_name) == 0) {
|
||||
single_test = 1 + i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i >= num_tests)
|
||||
single_test = atoi(name);
|
||||
}
|
||||
|
||||
|
||||
/* if only iteration is specified, assume we want the first test */
|
||||
if (single_test == -1 && single_iter != -1)
|
||||
single_test = 1;
|
||||
|
||||
if (single_test != -1) {
|
||||
if (single_test < 1 || single_test > num_tests) {
|
||||
test_printf_stderr("Invalid -%s value "
|
||||
"(Value must be a valid test name OR a value between %d..%d)\n",
|
||||
testname, 1, num_tests);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (single_iter != -1) {
|
||||
if (all_tests[single_test - 1].num == -1) {
|
||||
test_printf_stderr("-%s option is not valid for test %d:%s\n",
|
||||
itname,
|
||||
single_test,
|
||||
all_tests[single_test - 1].test_case_name);
|
||||
return 0;
|
||||
} else if (single_iter < 1
|
||||
|| single_iter > all_tests[single_test - 1].num) {
|
||||
test_printf_stderr("Invalid -%s value for test %d:%s\t"
|
||||
"(Value must be in the range %d..%d)\n",
|
||||
itname, single_test,
|
||||
all_tests[single_test - 1].test_case_name,
|
||||
1, all_tests[single_test - 1].num);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int process_shared_options(void)
|
||||
{
|
||||
OPTION_CHOICE_DEFAULT o;
|
||||
int value;
|
||||
int ret = -1;
|
||||
char *flag_test = "";
|
||||
char *flag_iter = "";
|
||||
char *testname = NULL;
|
||||
|
||||
opt_begin();
|
||||
while ((o = opt_next()) != OPT_EOF) {
|
||||
switch (o) {
|
||||
/* Ignore any test options at this level */
|
||||
default:
|
||||
break;
|
||||
case OPT_ERR:
|
||||
return ret;
|
||||
case OPT_TEST_HELP:
|
||||
opt_help(test_get_options());
|
||||
return 0;
|
||||
case OPT_TEST_LIST:
|
||||
show_list = 1;
|
||||
break;
|
||||
case OPT_TEST_SINGLE:
|
||||
flag_test = opt_flag();
|
||||
testname = opt_arg();
|
||||
break;
|
||||
case OPT_TEST_ITERATION:
|
||||
flag_iter = opt_flag();
|
||||
if (!opt_int(opt_arg(), &single_iter))
|
||||
goto end;
|
||||
break;
|
||||
case OPT_TEST_INDENT:
|
||||
if (!opt_int(opt_arg(), &value))
|
||||
goto end;
|
||||
level = 4 * value;
|
||||
break;
|
||||
case OPT_TEST_SEED:
|
||||
if (!opt_int(opt_arg(), &value))
|
||||
goto end;
|
||||
set_seed(value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!check_single_test_params(testname, flag_test, flag_iter))
|
||||
goto end;
|
||||
ret = 1;
|
||||
end:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
int pulldown_test_framework(int ret)
|
||||
{
|
||||
set_test_title(NULL);
|
||||
@@ -131,7 +249,6 @@ int pulldown_test_framework(int ret)
|
||||
&& CRYPTO_mem_leaks_cb(openssl_error_cb, NULL) <= 0)
|
||||
return EXIT_FAILURE;
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -176,14 +293,21 @@ int run_tests(const char *test_prog_name)
|
||||
int ii, i, jj, j, jstep;
|
||||
int permute[OSSL_NELEM(all_tests)];
|
||||
|
||||
i = process_shared_options();
|
||||
if (i == 0)
|
||||
return EXIT_SUCCESS;
|
||||
if (i == -1)
|
||||
return EXIT_FAILURE;
|
||||
|
||||
if (num_tests < 1) {
|
||||
test_printf_stdout("%*s1..0 # Skipped: %s\n", level, "",
|
||||
test_prog_name);
|
||||
} else {
|
||||
} else if (show_list == 0 && single_test == -1) {
|
||||
if (level > 0)
|
||||
test_printf_stdout("%*s# Subtest: %s\n", level, "", test_prog_name);
|
||||
test_printf_stdout("%*s1..%d\n", level, "", num_tests);
|
||||
}
|
||||
|
||||
test_flush_stdout();
|
||||
|
||||
for (i = 0; i < num_tests; i++)
|
||||
@@ -198,12 +322,25 @@ int run_tests(const char *test_prog_name)
|
||||
|
||||
for (ii = 0; ii != num_tests; ++ii) {
|
||||
i = permute[ii];
|
||||
if (all_tests[i].num == -1) {
|
||||
|
||||
if (single_test != -1 && ((i+1) != single_test)) {
|
||||
continue;
|
||||
}
|
||||
else if (show_list) {
|
||||
if (all_tests[i].num != -1) {
|
||||
test_printf_stdout("%d - %s (%d..%d)\n", ii + 1,
|
||||
all_tests[i].test_case_name, 1,
|
||||
all_tests[i].num);
|
||||
} else {
|
||||
test_printf_stdout("%d - %s\n", ii + 1,
|
||||
all_tests[i].test_case_name);
|
||||
}
|
||||
test_flush_stdout();
|
||||
} else if (all_tests[i].num == -1) {
|
||||
int ret = 0;
|
||||
|
||||
set_test_title(all_tests[i].test_case_name);
|
||||
ret = all_tests[i].test_fn();
|
||||
|
||||
verdict = 1;
|
||||
if (!ret) {
|
||||
verdict = 0;
|
||||
@@ -215,7 +352,7 @@ int run_tests(const char *test_prog_name)
|
||||
int num_failed_inner = 0;
|
||||
|
||||
level += 4;
|
||||
if (all_tests[i].subtest) {
|
||||
if (all_tests[i].subtest && single_iter == -1) {
|
||||
test_printf_stdout("%*s# Subtest: %s\n", level, "",
|
||||
all_tests[i].test_case_name);
|
||||
test_printf_stdout("%*s%d..%d\n", level, "", 1,
|
||||
@@ -235,6 +372,8 @@ int run_tests(const char *test_prog_name)
|
||||
int ret;
|
||||
|
||||
j = (j + jstep) % all_tests[i].num;
|
||||
if (single_iter != -1 && ((jj + 1) != single_iter))
|
||||
continue;
|
||||
set_test_title(NULL);
|
||||
ret = all_tests[i].param_test_fn(j);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user