diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-04-04 12:35:47 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-04-04 13:39:33 +0200 |
| commit | 2a2bc6fc12c6f6fc47c7c66dd4d0e3ef4be17777 (patch) | |
| tree | c5e7c9144ae14c9aae40961c1bc0c08b026fe384 | |
| parent | Document the 'no-module' configuration option (diff) | |
| download | openssl-2a2bc6fc12c6f6fc47c7c66dd4d0e3ef4be17777.tar.xz openssl-2a2bc6fc12c6f6fc47c7c66dd4d0e3ef4be17777.zip | |
For provider tests, don't define a OPENSSL_NO_ macro
Since the macro to indicate if the test provider module is available
is local to the test programs, it's better to use a name that isn't
as easily confused with a library feature disabling macro that one
would expect to find in opensslconf.h.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8664)
| -rw-r--r-- | test/build.info | 4 | ||||
| -rw-r--r-- | test/provider_internal_test.c | 4 | ||||
| -rw-r--r-- | test/provider_test.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/build.info b/test/build.info index 25abb068f3..8bf286eba4 100644 --- a/test/build.info +++ b/test/build.info @@ -613,8 +613,8 @@ IF[{- !$disabled{tests} -}] ENDIF ENDIF IF[{- $disabled{module} || !$target{dso_scheme} -}] - DEFINE[provider_test]=OPENSSL_NO_MODULE - DEFINE[provider_internal_test]=OPENSSL_NO_MODULE + DEFINE[provider_test]=NO_PROVIDER_MODULE + DEFINE[provider_internal_test]=NO_PROVIDER_MODULE ENDIF DEPEND[]=provider_internal_test.conf GENERATE[provider_internal_test.conf]=provider_internal_test.conf.in diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c index f3006fe263..6123d6b4f8 100644 --- a/test/provider_internal_test.c +++ b/test/provider_internal_test.c @@ -60,7 +60,7 @@ static int test_builtin_provider(void) && test_provider(prov, expected_greeting1(name)); } -#ifndef OPENSSL_NO_MODULE +#ifndef NO_PROVIDER_MODULE static int test_loaded_provider(void) { const char *name = "p_test"; @@ -89,7 +89,7 @@ static int test_configured_provider(void) int setup_tests(void) { ADD_TEST(test_builtin_provider); -#ifndef OPENSSL_NO_MODULE +#ifndef NO_PROVIDER_MODULE ADD_TEST(test_loaded_provider); ADD_TEST(test_configured_provider); #endif diff --git a/test/provider_test.c b/test/provider_test.c index ee6f94cbe1..c00f5ab4eb 100644 --- a/test/provider_test.c +++ b/test/provider_test.c @@ -49,7 +49,7 @@ static int test_builtin_provider(void) && test_provider(name); } -#ifndef OPENSSL_NO_MODULE +#ifndef NO_PROVIDER_MODULE static int test_loaded_provider(void) { const char *name = "p_test"; @@ -61,7 +61,7 @@ static int test_loaded_provider(void) int setup_tests(void) { ADD_TEST(test_builtin_provider); -#ifndef OPENSSL_NO_MODULE +#ifndef NO_PROVIDER_MODULE ADD_TEST(test_loaded_provider); #endif return 1; |