root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Dr. David von Oheimb 2021-04-03 14:05:09 +02:00 committed by Dr. David von Oheimb
parent 3ad6030948
commit f56c9c7c94
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cmp.c
View File

@ -2536,8 +2536,8 @@ int cmp_main(int argc, char **argv)
char mock_server[] = "mock server:1";
int ret = 0; /* default: failure */
prog = opt_appname(argv[0]);
if (argc <= 1) {
prog = opt_appname(argv[0]);
opt_help(cmp_options);
goto err;
}

3
apps/lib/opt.c
View File

@ -162,6 +162,9 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
opts = o;
unknown = NULL;
/* Make sure prog name is set for usage output */
(void)opt_progname(argv[0]);
/* Check all options up until the PARAM marker (if present) */
for (; o->name != NULL && o->name != OPT_PARAM_STR; ++o) {
#ifndef NDEBUG

3
test/evp_fetch_prov_test.c
View File

@ -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;

3
test/evp_test.c
View File

@ -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;

8
test/testutil.h
View File

@ -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.