diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-31 15:26:26 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-04-02 07:30:07 +0200 |
| commit | 521b7cb3883605740fb4727120f18810ba47d50b (patch) | |
| tree | 20007803ac107b1b8503343ba1d86ed3d16ea589 /test/build.info | |
| parent | Configuration / build: make it possible to disable building of modules (diff) | |
| download | openssl-521b7cb3883605740fb4727120f18810ba47d50b.tar.xz openssl-521b7cb3883605740fb4727120f18810ba47d50b.zip | |
Correct the checks of module availability in provider test programs
Previously, the macro OPENSSL_NO_SHARED was defined of the test/p_test
module wasn't built, but the provider test programs didn't check that
macro. We rename it to OPENSSL_NO_MODULE, since that name describes
the situation more than OPENSSL_NO_SHARED does, and use it.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8623)
Diffstat (limited to 'test/build.info')
| -rw-r--r-- | test/build.info | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/build.info b/test/build.info index 04b356bd7d..973536dc51 100644 --- a/test/build.info +++ b/test/build.info @@ -611,9 +611,10 @@ IF[{- !$disabled{tests} -}] SOURCE[p_test]=p_test.ld GENERATE[p_test.ld]=../util/providers.num ENDIF - ELSE - DEFINE[provider_test]=OPENSSL_NO_SHARED - DEFINE[provider_internal_test]=OPENSSL_NO_SHARED + ENDIF + IF[{- $disabled{module} || !$target{dso_scheme} -}] + DEFINE[provider_test]=OPENSSL_NO_MODULE + DEFINE[provider_internal_test]=OPENSSL_NO_MODULE ENDIF PROGRAMS{noinst}=params_test |