zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testutil: allow a failure return from setup_tests that doesn't print help

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/21621)
This commit is contained in:
Pauli 2023-08-02 10:40:23 +10:00
parent 029ddd1ead
commit badf3c162d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/README-dev.md
View File

@ -130,7 +130,11 @@ Generic form of C test executables
int setup_tests(void) int setup_tests(void)
{ {
ADD_TEST(my_test); /* Add each test separately */ ADD_TEST(my_test); /* Add each test separately */
return 1; /* Indicate success */ return 1; /* Indicates success. Return 0 */
/* to produce an error with a */
/* usage message and -1 for */
/* failure to set up with no */
/* usage message. */
} }
You should use the `TEST_xxx` macros provided by `testutil.h` to test all failure You should use the `TEST_xxx` macros provided by `testutil.h` to test all failure

5
test/testutil/main.c
View File

@ -15,6 +15,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret = EXIT_FAILURE; int ret = EXIT_FAILURE;
int setup_res;
test_open_streams(); test_open_streams();
@ -26,11 +27,11 @@ int main(int argc, char *argv[])
if (!setup_test_framework(argc, argv)) if (!setup_test_framework(argc, argv))
goto end; goto end;
if (setup_tests()) { if ((setup_res = setup_tests()) > 0) {
ret = run_tests(argv[0]); ret = run_tests(argv[0]);
cleanup_tests(); cleanup_tests();
opt_check_usage(); opt_check_usage();
} else { } else if (setup_res == 0) {
opt_help(test_get_options()); opt_help(test_get_options());
} }
end: end: