diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-04 10:49:38 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-07 08:57:05 +1000 |
| commit | 99801878c09404e45d8176739d3a555c41b77d0b (patch) | |
| tree | 17849c441cb202056cfc94d91377878400c7feed /test/cipherlist_test.c | |
| parent | 5f8dd0f849d3bb87b2224715f8880716f39e9b0a (diff) | |
Change SETUP_TEST_FIXTURE so that the fixture structure is passed by
reference not by value. This allows an error return from the setup function.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4083)
Diffstat (limited to 'test/cipherlist_test.c')
| -rw-r--r-- | test/cipherlist_test.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index 2cfddb0d82..0297b0d2fa 100644 --- a/test/cipherlist_test.c +++ b/test/cipherlist_test.c @@ -181,7 +181,7 @@ static int execute_test(CIPHERLIST_TEST_FIXTURE *fixture) } #define SETUP_CIPHERLIST_TEST_FIXTURE() \ - SETUP_TEST_FIXTURE(CIPHERLIST_TEST_FIXTURE *, set_up) + SETUP_TEST_FIXTURE(CIPHERLIST_TEST_FIXTURE, set_up) #define EXECUTE_CIPHERLIST_TEST() \ EXECUTE_TEST(execute_test, tear_down) @@ -189,7 +189,10 @@ static int execute_test(CIPHERLIST_TEST_FIXTURE *fixture) static int test_default_cipherlist_implicit() { SETUP_CIPHERLIST_TEST_FIXTURE(); + if (fixture == NULL) + return 0; EXECUTE_CIPHERLIST_TEST(); + return result; } static int test_default_cipherlist_explicit() @@ -201,6 +204,7 @@ static int test_default_cipherlist_explicit() || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, "DEFAULT"))) tear_down(fixture); EXECUTE_CIPHERLIST_TEST(); + return result; } int setup_tests() |