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/recordlentest.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/recordlentest.c')
-rw-r--r-- | test/recordlentest.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/test/recordlentest.c b/test/recordlentest.c index 57c4648bcc..d0941ca416 100644 --- a/test/recordlentest.c +++ b/test/recordlentest.c @@ -184,22 +184,17 @@ static int test_record_overflow(int idx) return testresult; } -int test_main(int argc, char *argv[]) +int setup_tests(void) { - int testresult = 1; - - if (argc != 3) { - TEST_error("Invalid argument count"); - return 1; - } - cert = argv[1]; - privkey = argv[2]; + if (!TEST_ptr(cert = test_get_argument(0)) + || !TEST_ptr(privkey = test_get_argument(1))) + return 0; ADD_ALL_TESTS(test_record_overflow, TOTAL_RECORD_OVERFLOW_TESTS); + return 1; +} - testresult = run_tests(argv[0]); - +void cleanup_tests(void) +{ bio_s_mempacket_test_free(); - - return testresult; } |