diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-04-03 14:05:09 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-04-14 16:51:11 +0200 |
| commit | f56c9c7c942cd82595bb47808c732048141dc72d (patch) | |
| tree | b35fb61f2d0ce7af0482b9baf6632e91877f0cf9 /test | |
| parent | APPS: make apps strict on app_RAND_load() and app_RAND_write() failure (diff) | |
| download | openssl-f56c9c7c942cd82595bb47808c732048141dc72d.tar.xz openssl-f56c9c7c942cd82595bb47808c732048141dc72d.zip | |
APPS and TEST: Make sure prog name is set for usage output
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14841)
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_fetch_prov_test.c | 3 | ||||
| -rw-r--r-- | test/evp_test.c | 3 | ||||
| -rw-r--r-- | test/testutil.h | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/test/evp_fetch_prov_test.c b/test/evp_fetch_prov_test.c index 18e57c76c6..ec339ebbc3 100644 --- a/test/evp_fetch_prov_test.c +++ b/test/evp_fetch_prov_test.c @@ -47,8 +47,7 @@ const OPTIONS *test_get_options(void) { "fetchfail", OPT_FETCH_FAILURE, '-', "fetch is expected to fail" }, { "defaultctx", OPT_USE_DEFAULTCTX, '-', "Use the default context if this is set" }, - { OPT_HELP_STR, 1, '-', - "file\tProvider names to explicitly load\n" }, + { OPT_HELP_STR, 1, '-', "file\tProvider names to explicitly load\n" }, { NULL } }; return test_options; diff --git a/test/evp_test.c b/test/evp_test.c index a7a3cc4bb3..503aaa0e8e 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -3570,8 +3570,7 @@ const OPTIONS *test_get_options(void) OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("[file...]\n"), { "config", OPT_CONFIG_FILE, '<', "The configuration file to use for the libctx" }, - { OPT_HELP_STR, 1, '-', - "file\tFile to run tests on.\n" }, + { OPT_HELP_STR, 1, '-', "file\tFile to run tests on.\n" }, { NULL } }; return test_options; diff --git a/test/testutil.h b/test/testutil.h index 8457a2a384..9311e2ce58 100644 --- a/test/testutil.h +++ b/test/testutil.h @@ -174,9 +174,9 @@ * the test system. * * Tests that need to use opt_next() need to specify - * (1) test_get_options() containing an options[] (Which should include either - * OPT_TEST_OPTIONS_DEFAULT_USAGE OR - * OPT_TEST_OPTIONS_WITH_EXTRA_USAGE). + * (1) test_get_options() containing an options[] which should include either + * OPT_TEST_OPTIONS_DEFAULT_USAGE or + * OPT_TEST_OPTIONS_WITH_EXTRA_USAGE(...). * (2) An enum outside the test_get_options() which contains OPT_TEST_ENUM, as * well as the additional options that need to be handled. * (3) case OPT_TEST_CASES: break; inside the opt_next() handling code. @@ -232,7 +232,7 @@ void cleanup_tests(void); * Used to supply test specific command line options, * If non optional parameters are used, then the first entry in the OPTIONS[] * should contain: - * { OPT_HELP_STR, 1, '-', "list of non optional commandline params\n"}, + * { OPT_HELP_STR, 1, '-', "<list of non-optional commandline params>\n"}, * The last entry should always be { NULL }. * * Run the test locally using './test/test_name -help' to check the usage. |