diff options
| author | Matt Caswell <matt@openssl.org> | 2018-11-15 14:50:52 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-04 13:19:14 +0000 |
| commit | df5228e3b294fc546d0f8ea46e40ac111db58650 (patch) | |
| tree | 1145f604681205c4c819870f604569661f12c0f6 /test/shlibloadtest.c | |
| parent | 9c5ef4ea486f675f33592b34775c3e453f60ee69 (diff) | |
| download | openssl-df5228e3b294fc546d0f8ea46e40ac111db58650.tar.gz | |
Fix shlibloadtest to properly execute the dso_ref test
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7647)
Diffstat (limited to 'test/shlibloadtest.c')
| -rw-r--r-- | test/shlibloadtest.c | 12 |
1 files 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; |