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>

diff --git a/Configure b/Configure
index 70ae456db71ce0204f275272de3347f2db0b9945..3289e9f1a7f3c60cdb13ab48d9f71e536f4b2997 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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",

diff --git a/INSTALL b/INSTALL
index a3932258c057b1d488d5ac3b491a43ab896c93f3..e31431bfbe5363445e8c63440427d7fef4437b4f 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -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 b669d61d32f76ba13d103ca112ee80755de45d7c..aa5f0624f8a52fe3b226930ae734169cb2be7dc5 100644 (file)
--- 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