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/ectest.c | |
parent | d445302418b41b76c15e103954b1311d98077480 (diff) |
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/ectest.c')
-rw-r--r-- | test/ectest.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/ectest.c b/test/ectest.c index c6e60acb57..85bb46212b 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -1430,15 +1430,13 @@ static const char rnd_seed[] = "string to make the random number generator think it has randomness"; #endif -int test_main(int argc, char *argv[]) +int setup_tests(void) { - int result = EXIT_SUCCESS; #ifndef OPENSSL_NO_EC - crv_len = EC_get_builtin_curves(NULL, 0); if (!TEST_ptr(curves = OPENSSL_malloc(sizeof(*curves) * crv_len)) || !TEST_true(EC_get_builtin_curves(curves, crv_len))) - return EXIT_FAILURE; + return 0; RAND_seed(rnd_seed, sizeof rnd_seed); /* or BN_generate_prime may fail */ @@ -1453,9 +1451,11 @@ int test_main(int argc, char *argv[]) # endif ADD_ALL_TESTS(internal_curve_test, crv_len); ADD_ALL_TESTS(internal_curve_test_method, crv_len); +#endif + return 1; +} - result = run_tests(argv[0]); +void cleanup_tests(void) +{ OPENSSL_free(curves); -#endif - return result; } |