X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fcipherlist_test.c;h=829042748a45255cf5f925693fcbbe525e66d185;hp=2cfddb0d825855053eabe2c5561cb47e24aed77b;hb=31a80694d425bf7f3a0ed5cc2ee775d9418a5490;hpb=2326bba0e5cbe98f4d00855a6909b1f14b6f5427 diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index 2cfddb0d82..829042748a 100644 --- a/test/cipherlist_test.c +++ b/test/cipherlist_test.c @@ -181,18 +181,21 @@ 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) -static int test_default_cipherlist_implicit() +static int test_default_cipherlist_implicit(void) { SETUP_CIPHERLIST_TEST_FIXTURE(); + if (fixture == NULL) + return 0; EXECUTE_CIPHERLIST_TEST(); + return result; } -static int test_default_cipherlist_explicit() +static int test_default_cipherlist_explicit(void) { SETUP_CIPHERLIST_TEST_FIXTURE(); if (fixture == NULL) @@ -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()