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>
This commit is contained in:
Matt Caswell 2016-10-12 16:21:13 +01:00
parent cfa7697986
commit ce2596d404
3 changed files with 9 additions and 1 deletions

View File

@ -362,6 +362,7 @@ my @disablables = (
"egd", "egd",
"engine", "engine",
"err", "err",
"external-tests",
"filenames", "filenames",
"fuzz-libfuzzer", "fuzz-libfuzzer",
"fuzz-afl", "fuzz-afl",
@ -431,6 +432,7 @@ our %disabled = ( # "what" => "comment"
"crypto-mdebug-backtrace" => "default", "crypto-mdebug-backtrace" => "default",
"ec_nistp_64_gcc_128" => "default", "ec_nistp_64_gcc_128" => "default",
"egd" => "default", "egd" => "default",
"external-tests" => "default",
"fuzz-libfuzzer" => "default", "fuzz-libfuzzer" => "default",
"fuzz-afl" => "default", "fuzz-afl" => "default",
"heartbeats" => "default", "heartbeats" => "default",

View File

@ -310,6 +310,12 @@
no-err no-err
Don't compile in any error strings. 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 no-filenames
Don't compile in filename and line number information (e.g. Don't compile in filename and line number information (e.g.
for errors and memory allocation). for errors and memory allocation).

View File

@ -1,4 +1,4 @@
IF[{- defined $target{cxx} -}] IF[{- defined $target{cxx} && !$disabled{"external-tests"}-}]
PROGRAMS_NO_INST=ossl_shim PROGRAMS_NO_INST=ossl_shim
SOURCE[ossl_shim]=ossl_shim.cc async_bio.cc packeted_bio.cc test_config.cc SOURCE[ossl_shim]=ossl_shim.cc async_bio.cc packeted_bio.cc test_config.cc
INCLUDE[ossl_shim]=. include ../../include INCLUDE[ossl_shim]=. include ../../include