openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
Richard Levitte 2019-04-04 12:35:47 +02:00
parent 706b6333a6
commit 2a2bc6fc12
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/build.info
View File

@ -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

4
test/provider_internal_test.c
View File

@ -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

4
test/provider_test.c
View File

@ -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;