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/bio_enc_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/bio_enc_test.c')
| -rw-r--r-- | test/bio_enc_test.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c index bc49a7992a..8474dc516e 100644 --- a/test/bio_enc_test.c +++ b/test/bio_enc_test.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-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 @@ -212,7 +212,7 @@ static int test_bio_enc_chacha20_poly1305(int idx) return do_test_bio_cipher(EVP_chacha20_poly1305(), idx); } -void register_tests(void) +int setup_tests(void) { ADD_ALL_TESTS(test_bio_enc_aes_128_cbc, 2); ADD_ALL_TESTS(test_bio_enc_aes_128_ctr, 2); @@ -224,4 +224,5 @@ void register_tests(void) ADD_ALL_TESTS(test_bio_enc_chacha20_poly1305, 2); # endif # endif + return 1; } |