diff options
| author | Pauli <paul.dale@oracle.com> | 2017-07-18 03:48:27 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-07-26 23:53:08 +0200 |
| commit | ad887416f1e59c3294a7d8f83a0ca77120523b4a (patch) | |
| tree | 99971c4acaaa7a43efa38a0d52e230c0e68a1c6c /test/srptest.c | |
| parent | Simplify the handling of shared library version numbers (diff) | |
| download | openssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.tar.xz openssl-ad887416f1e59c3294a7d8f83a0ca77120523b4a.zip | |
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/srptest.c')
| -rw-r--r-- | test/srptest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/srptest.c b/test/srptest.c index ed5bf611a6..bb1682e714 100644 --- a/test/srptest.c +++ b/test/srptest.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-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 @@ -264,7 +264,7 @@ static int run_srp_tests(void) } #endif -void register_tests(void) +int setup_tests(void) { #ifdef OPENSSL_NO_SRP printf("No SRP support\n"); @@ -272,4 +272,5 @@ void register_tests(void) ADD_TEST(run_srp_tests); ADD_TEST(run_srp_kat); #endif + return 1; } |