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/igetest.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/igetest.c')
| -rw-r--r-- | test/igetest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/igetest.c b/test/igetest.c index a0fc623a64..a5c890e346 100644 --- a/test/igetest.c +++ b/test/igetest.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -433,7 +433,7 @@ static int test_bi_ige_garble3(void) return TEST_size_t_le(matches, sizeof checktext / 100); } -void register_tests(void) +int setup_tests(void) { RAND_bytes(rkey, sizeof rkey); RAND_bytes(rkey2, sizeof rkey2); @@ -450,4 +450,5 @@ void register_tests(void) ADD_TEST(test_bi_ige_garble3); ADD_ALL_TESTS(test_ige_vectors, OSSL_NELEM(ige_test_vectors)); ADD_ALL_TESTS(test_bi_ige_vectors, OSSL_NELEM(bi_ige_test_vectors)); + return 1; } |