提交 d6399c85 编写于 作者: M Matt Caswell

Fix shlibloadtest to properly execute the dso_ref test

Reviewed-by: NTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7983)
上级 d7389c82
...@@ -117,6 +117,7 @@ static int test_lib(void) ...@@ -117,6 +117,7 @@ static int test_lib(void)
switch (test_type) { switch (test_type) {
case JUST_CRYPTO: case JUST_CRYPTO:
case DSO_REFTEST:
if (!TEST_true(shlib_load(path_crypto, &cryptolib))) if (!TEST_true(shlib_load(path_crypto, &cryptolib)))
goto end; goto end;
break; break;
...@@ -130,10 +131,6 @@ static int test_lib(void) ...@@ -130,10 +131,6 @@ static int test_lib(void)
|| !TEST_true(shlib_load(path_crypto, &cryptolib))) || !TEST_true(shlib_load(path_crypto, &cryptolib)))
goto end; goto end;
break; break;
case DSO_REFTEST:
if (!TEST_true(shlib_load(path_crypto, &cryptolib)))
goto end;
break;
} }
if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) { if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) {
...@@ -205,6 +202,7 @@ static int test_lib(void) ...@@ -205,6 +202,7 @@ static int test_lib(void)
switch (test_type) { switch (test_type) {
case JUST_CRYPTO: case JUST_CRYPTO:
case DSO_REFTEST:
if (!TEST_true(shlib_close(cryptolib))) if (!TEST_true(shlib_close(cryptolib)))
goto end; goto end;
break; break;
...@@ -218,10 +216,6 @@ static int test_lib(void) ...@@ -218,10 +216,6 @@ static int test_lib(void)
|| !TEST_true(shlib_close(cryptolib))) || !TEST_true(shlib_close(cryptolib)))
goto end; goto end;
break; break;
case DSO_REFTEST:
if (!TEST_true(shlib_close(cryptolib)))
goto end;
break;
} }
result = 1; result = 1;
...@@ -242,7 +236,7 @@ int setup_tests(void) ...@@ -242,7 +236,7 @@ int setup_tests(void)
} else if (strcmp(p, "-just_crypto") == 0) { } else if (strcmp(p, "-just_crypto") == 0) {
test_type = JUST_CRYPTO; test_type = JUST_CRYPTO;
} else if (strcmp(p, "-dso_ref") == 0) { } else if (strcmp(p, "-dso_ref") == 0) {
test_type = JUST_CRYPTO; test_type = DSO_REFTEST;
} else { } else {
TEST_error("Unrecognised argument"); TEST_error("Unrecognised argument");
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册