diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2018-08-16 12:36:01 +1000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-02-11 15:31:51 +0100 |
commit | a43ce58f5569a160272c492c680f2e42d38ec769 (patch) | |
tree | acfaac32bee9b8e5dd832fbb49f95709c3b9741e /test/curve448_internal_test.c | |
parent | 9d5560331d86c6463e965321f774e4eed582ce0b (diff) | |
download | openssl-a43ce58f5569a160272c492c680f2e42d38ec769.zip openssl-a43ce58f5569a160272c492c680f2e42d38ec769.tar.gz openssl-a43ce58f5569a160272c492c680f2e42d38ec769.tar.bz2 |
Updated test command line parsing to support commmon commands
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6975)
Diffstat (limited to 'test/curve448_internal_test.c')
-rw-r--r-- | test/curve448_internal_test.c | 52 |
1 files changed, 41 insertions, 11 deletions
diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c index 92332b3..85c0b0e 100644 --- a/test/curve448_internal_test.c +++ b/test/curve448_internal_test.c @@ -682,19 +682,49 @@ static int test_x448(void) return 1; } +typedef enum OPTION_choice { + OPT_ERR = -1, + OPT_EOF = 0, + OPT_PROGRESS, + OPT_SLOW, + OPT_TEST_ENUM +} OPTION_CHOICE; + +const OPTIONS *test_get_options(void) +{ + static const OPTIONS test_options[] = { + OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("conf_file\n"), + { "f", OPT_SLOW, '-', "Enables a slow test" }, + { "v", OPT_PROGRESS, '-', + "Enables verbose mode (prints progress dots)" }, + { NULL } + }; + return test_options; +} + int setup_tests(void) { - /* - * The test vectors contain one test which takes a very long time to run, - * so we don't do that be default. Using the -f option will cause it to be - * run. - */ - if (test_has_option("-f")) - max = 1000000; - - /* Print progress dots */ - if (test_has_option("-v")) - verbose = 1; + OPTION_CHOICE o; + + while ((o = opt_next()) != OPT_EOF) { + switch (o) { + case OPT_TEST_CASES: + break; + default: + return 0; + /* + * The test vectors contain one test which takes a very long time to run + * so we don't do that be default. Using the -f option will cause it to + * be run. + */ + case OPT_SLOW: + max = 1000000; + break; + case OPT_PROGRESS: + verbose = 1; /* Print progress dots */ + break; + } + } ADD_TEST(test_x448); ADD_TEST(test_ed448); |