diff options
| author | Matt Caswell <matt@openssl.org> | 2019-03-12 12:36:08 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-03-13 11:03:54 +0100 |
| commit | 80889e41a72ea2520959505537f38343958b761a (patch) | |
| tree | 588dbc30df5e60c585b2111819c30efe3da06414 /test/provider_internal_test.c | |
| parent | Fix various no-* options (diff) | |
| download | openssl-80889e41a72ea2520959505537f38343958b761a.tar.xz openssl-80889e41a72ea2520959505537f38343958b761a.zip | |
Fix no-dso
Don't try to load external provider modules in tests if we don't have DSO
capability
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8459)
Diffstat (limited to 'test/provider_internal_test.c')
| -rw-r--r-- | test/provider_internal_test.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c index 8ce382effa..ca554b8932 100644 --- a/test/provider_internal_test.c +++ b/test/provider_internal_test.c @@ -11,6 +11,11 @@ #include "internal/provider.h" #include "testutil.h" +#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL) \ + && !defined(DSO_WIN32) && !defined(DSO_DLFCN) +# define OPENSSL_NO_DSO +#endif + extern OSSL_provider_init_fn PROVIDER_INIT_FUNCTION_NAME; static char buf[256]; @@ -56,7 +61,7 @@ static int test_builtin_provider(void) && test_provider(prov); } -#ifndef OPENSSL_NO_SHARED +#ifndef OPENSSL_NO_DSO static int test_loaded_provider(void) { const char *name = "p_test"; @@ -71,7 +76,7 @@ static int test_loaded_provider(void) int setup_tests(void) { ADD_TEST(test_builtin_provider); -#ifndef OPENSSL_NO_SHARED +#ifndef OPENSSL_NO_DSO ADD_TEST(test_loaded_provider); #endif return 1; |