From ad887416f1e59c3294a7d8f83a0ca77120523b4a Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 18 Jul 2017 11:48:27 +1000 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/3953) --- test/ssl_test_ctx_test.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'test/ssl_test_ctx_test.c') diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c index 08775354cc..c72bcb0df9 100644 --- a/test/ssl_test_ctx_test.c +++ b/test/ssl_test_ctx_test.c @@ -215,25 +215,23 @@ static int test_bad_configuration(int idx) return 1; } -int test_main(int argc, char **argv) +int setup_tests(void) { - int result = 0; - - if (argc != 2) { - TEST_info("Missing file argument"); - goto end; + if (!TEST_ptr(conf = NCONF_new(NULL))) + return 0; + /* argument should point to test/ssl_test_ctx_test.conf */ + if (!TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)) { + TEST_note("Missing file argument"); + return 0; } - if (!TEST_ptr(conf = NCONF_new(NULL)) - /* argv[1] should point to test/ssl_test_ctx_test.conf */ - || !TEST_int_gt(NCONF_load(conf, argv[1], NULL), 0)) - goto end; ADD_TEST(test_empty_configuration); ADD_TEST(test_good_configuration); ADD_ALL_TESTS(test_bad_configuration, OSSL_NELEM(bad_configurations)); - result = run_tests(argv[0]); + return 1; +} -end: +void cleanup_tests(void) +{ NCONF_free(conf); - return result; } -- cgit v1.2.1