From df5228e3b294fc546d0f8ea46e40ac111db58650 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 15 Nov 2018 14:50:52 +0000 Subject: [PATCH] Fix shlibloadtest to properly execute the dso_ref test Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7647) --- test/shlibloadtest.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index 4c5d80106e..dcb19752e8 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -121,6 +121,7 @@ static int test_lib(void) switch (test_type) { case JUST_CRYPTO: + case DSO_REFTEST: if (!TEST_true(shlib_load(path_crypto, &cryptolib))) goto end; break; @@ -134,10 +135,6 @@ static int test_lib(void) || !TEST_true(shlib_load(path_crypto, &cryptolib))) goto end; break; - case DSO_REFTEST: - if (!TEST_true(shlib_load(path_crypto, &cryptolib))) - goto end; - break; } if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) { @@ -210,6 +207,7 @@ static int test_lib(void) switch (test_type) { case JUST_CRYPTO: + case DSO_REFTEST: if (!TEST_true(shlib_close(cryptolib))) goto end; break; @@ -223,10 +221,6 @@ static int test_lib(void) || !TEST_true(shlib_close(cryptolib))) goto end; break; - case DSO_REFTEST: - if (!TEST_true(shlib_close(cryptolib))) - goto end; - break; } result = 1; @@ -247,7 +241,7 @@ int setup_tests(void) } else if (strcmp(p, "-just_crypto") == 0) { test_type = JUST_CRYPTO; } else if (strcmp(p, "-dso_ref") == 0) { - test_type = JUST_CRYPTO; + test_type = DSO_REFTEST; } else { TEST_error("Unrecognised argument"); return 0; -- 2.25.1