diff options
author | Pauli <paul.dale@oracle.com> | 2017-07-18 11:48:27 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-07-27 07:53:08 +1000 |
commit | ad887416f1e59c3294a7d8f83a0ca77120523b4a (patch) | |
tree | 99971c4acaaa7a43efa38a0d52e230c0e68a1c6c /test/ssl_test.c | |
parent | d445302418b41b76c15e103954b1311d98077480 (diff) | |
download | openssl-new-ad887416f1e59c3294a7d8f83a0ca77120523b4a.tar.gz |
Update the test framework so that the need for test_main is removed. Everything
that needed test_main now works using the same infrastructure as tests that used
register_tests.
This meant:
* renaming register_tests to setup_tests and giving it a success/failure return.
* renaming the init_test function to setup_test_framework.
* renaming the finish_test function to pulldown_test_framework.
* adding a user provided global_init function that runs before the test frame
work is initialised. It returns a failure indication that stops the stest.
* adding helper functions that permit tests to access their command line args.
* spliting the BIO initialisation and finalisation out from the test setup and
teardown.
* hiding some of the now test internal functions.
* fix the comments in testutil.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3953)
Diffstat (limited to 'test/ssl_test.c')
-rw-r--r-- | test/ssl_test.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/test/ssl_test.c b/test/ssl_test.c index e5f0f3068d..44232dbdf4 100644 --- a/test/ssl_test.c +++ b/test/ssl_test.c @@ -428,23 +428,22 @@ err: return ret; } -int test_main(int argc, char **argv) +int setup_tests(void) { - int result = EXIT_FAILURE; long num_tests; - if (!TEST_int_eq(argc, 2) - || !TEST_ptr(conf = NCONF_new(NULL)) + if (!TEST_ptr(conf = NCONF_new(NULL)) /* argv[1] should point to the test conf file */ - || !TEST_int_gt(NCONF_load(conf, argv[1], NULL), 0) + || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0) || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests", &num_tests), 0)) - goto err; + return 0; - ADD_ALL_TESTS(test_handshake, (int)(num_tests)); - result = run_tests(argv[0]); + ADD_ALL_TESTS(test_handshake, (int)num_tests); + return 1; +} -err: +void cleanup_tests(void) +{ NCONF_free(conf); - return result; } |