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/danetest.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/danetest.c')
-rw-r--r-- | test/danetest.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/test/danetest.c b/test/danetest.c index a0fd0ce74b..b589ede426 100644 --- a/test/danetest.c +++ b/test/danetest.c @@ -1,5 +1,5 @@ /* - * Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-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 @@ -409,22 +409,17 @@ end: return ret; } -int test_main(int argc, char *argv[]) +int setup_tests(void) { - int ret = 0; - - if (argc != 4) { + if (!TEST_ptr(basedomain = test_get_argument(0)) + || !TEST_ptr(CAfile = test_get_argument(1)) + || !TEST_ptr(tlsafile = test_get_argument(2))) { TEST_error("Usage error: danetest basedomain CAfile tlsafile"); return 0; } - basedomain = argv[1]; - CAfile = argv[2]; - tlsafile = argv[3]; ADD_TEST(run_tlsatest); - - ret = run_tests(argv[0]); - return ret; + return 1; } #include <internal/dane.h> |