diff options
Diffstat (limited to 'crypto/openssl/test/testutil/driver.c')
| -rw-r--r-- | crypto/openssl/test/testutil/driver.c | 68 |
1 files changed, 31 insertions, 37 deletions
diff --git a/crypto/openssl/test/testutil/driver.c b/crypto/openssl/test/testutil/driver.c index 346092b0046d..1097c68fc3da 100644 --- a/crypto/openssl/test/testutil/driver.c +++ b/crypto/openssl/test/testutil/driver.c @@ -17,24 +17,23 @@ #include "internal/nelem.h" #include <openssl/bio.h> -#include "platform.h" /* From libapps */ +#include "platform.h" /* From libapps */ #if defined(_WIN32) && !defined(__BORLANDC__) -# define strdup _strdup +#define strdup _strdup #endif - /* * Declares the structures needed to register each test case function. */ typedef struct test_info { const char *test_case_name; - int (*test_fn) (void); + int (*test_fn)(void); int (*param_test_fn)(int idx); int num; /* flags */ - int subtest:1; + int subtest : 1; } TEST_INFO; static TEST_INFO all_tests[1024]; @@ -55,8 +54,7 @@ static int num_test_cases = 0; static int process_shared_options(void); - -void add_test(const char *test_case_name, int (*test_fn) (void)) +void add_test(const char *test_case_name, int (*test_fn)(void)) { assert(num_tests != OSSL_NELEM(all_tests)); all_tests[num_tests].test_case_name = test_case_name; @@ -66,8 +64,8 @@ void add_test(const char *test_case_name, int (*test_fn) (void)) ++num_test_cases; } -void add_all_tests(const char *test_case_name, int(*test_fn)(int idx), - int num, int subtest) +void add_all_tests(const char *test_case_name, int (*test_fn)(int idx), + int num, int subtest) { assert(num_tests != OSSL_NELEM(all_tests)); all_tests[num_tests].test_case_name = test_case_name; @@ -99,7 +97,6 @@ static void set_seed(int s) test_random_seed(seed); } - int setup_test_framework(int argc, char *argv[]) { char *test_rand_order = getenv("OPENSSL_TEST_RAND_ORDER"); @@ -132,7 +129,6 @@ int setup_test_framework(int argc, char *argv[]) return 1; } - /* * This can only be called after setup() has run, since num_tests and * all_tests[] are setup at this point @@ -151,7 +147,6 @@ static int check_single_test_params(char *name, char *testname, char *itname) 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; @@ -160,24 +155,24 @@ static int check_single_test_params(char *name, char *testname, char *itname) 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); + 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); + 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) { + || 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); + itname, single_test, + all_tests[single_test - 1].test_case_name, + 1, all_tests[single_test - 1].num); return 0; } } @@ -236,7 +231,6 @@ end: return ret; } - int pulldown_test_framework(int ret) { set_test_title(NULL); @@ -259,8 +253,9 @@ void set_test_title(const char *title) test_title = title == NULL ? NULL : strdup(title); } -PRINTF_FORMAT(2, 3) static void test_verdict(int verdict, - const char *description, ...) +PRINTF_FORMAT(2, 3) +static void test_verdict(int verdict, + const char *description, ...) { va_list ap; @@ -323,17 +318,16 @@ int run_tests(const char *test_prog_name) for (ii = 0; ii != num_tests; ++ii) { i = permute[ii]; - if (single_test != -1 && ((i+1) != single_test)) { + if (single_test != -1 && ((i + 1) != single_test)) { continue; - } - else if (show_list) { + } else if (show_list) { if (all_tests[i].num != -1) { test_printf_tapout("%d - %s (%d..%d)\n", ii + 1, - all_tests[i].test_case_name, 1, - all_tests[i].num); + all_tests[i].test_case_name, 1, + all_tests[i].num); } else { test_printf_tapout("%d - %s\n", ii + 1, - all_tests[i].test_case_name); + all_tests[i].test_case_name); } test_flush_tapout(); } else if (all_tests[i].num == -1) { @@ -386,11 +380,11 @@ int run_tests(const char *test_prog_name) if (all_tests[i].subtest) test_verdict(v, "%d - iteration %d", - subtest_case_count + 1, j + 1); + subtest_case_count + 1, j + 1); else test_verdict(v, "%d - %s - iteration %d", - test_case_count + subtest_case_count + 1, - test_title, j + 1); + test_case_count + subtest_case_count + 1, + test_title, j + 1); subtest_case_count++; } @@ -402,7 +396,7 @@ int run_tests(const char *test_prog_name) ++num_failed; if (all_tests[i].num == -1 || all_tests[i].subtest) test_verdict(verdict, "%d - %s", test_case_count + 1, - all_tests[i].test_case_name); + all_tests[i].test_case_name); test_case_count++; } } @@ -438,13 +432,13 @@ char *glue_strings(const char *list[], size_t *out_len) char *test_mk_file_path(const char *dir, const char *file) { -# ifndef OPENSSL_SYS_VMS +#ifndef OPENSSL_SYS_VMS const char *sep = "/"; -# else +#else const char *sep = ""; char *dir_end; char dir_end_sep; -# endif +#endif size_t dirlen = dir != NULL ? strlen(dir) : 0; size_t len = dirlen + strlen(sep) + strlen(file) + 1; char *full_file = OPENSSL_zalloc(len); @@ -452,7 +446,7 @@ char *test_mk_file_path(const char *dir, const char *file) if (full_file != NULL) { if (dir != NULL && dirlen > 0) { OPENSSL_strlcpy(full_file, dir, len); -# ifdef OPENSSL_SYS_VMS +#ifdef OPENSSL_SYS_VMS /* * If |file| contains a directory spec, we need to do some * careful merging. |