diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-12 16:21:13 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 10:38:54 +0000 |
| commit | ce2596d404c16266b6bd5614b2d5159b67054d58 (patch) | |
| tree | b44dc2e358716b38266801abc280a986e0a447de | |
| parent | cfa76979867a2401d435cafe66e05c4234785480 (diff) | |
Control building of ossl_shim through Configure
Don't build ossl_shim by default. Switch it on through
enable-external-tests.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | INSTALL | 6 | ||||
| -rw-r--r-- | test/ossl_shim/build.info | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -362,6 +362,7 @@ my @disablables = ( "egd", "engine", "err", + "external-tests", "filenames", "fuzz-libfuzzer", "fuzz-afl", @@ -431,6 +432,7 @@ our %disabled = ( # "what" => "comment" "crypto-mdebug-backtrace" => "default", "ec_nistp_64_gcc_128" => "default", "egd" => "default", + "external-tests" => "default", "fuzz-libfuzzer" => "default", "fuzz-afl" => "default", "heartbeats" => "default", @@ -310,6 +310,12 @@ no-err Don't compile in any error strings. + enable-external-tests + Enable building of integration with external test suites. + This is a developer option and may not work on all platforms. + The only supported external test suite at the current time is + the BoringSSL test suite. + no-filenames Don't compile in filename and line number information (e.g. for errors and memory allocation). diff --git a/test/ossl_shim/build.info b/test/ossl_shim/build.info index b669d61d32..aa5f0624f8 100644 --- a/test/ossl_shim/build.info +++ b/test/ossl_shim/build.info @@ -1,4 +1,4 @@ -IF[{- defined $target{cxx} -}] +IF[{- defined $target{cxx} && !$disabled{"external-tests"}-}] PROGRAMS_NO_INST=ossl_shim SOURCE[ossl_shim]=ossl_shim.cc async_bio.cc packeted_bio.cc test_config.cc INCLUDE[ossl_shim]=. include ../../include |