From: Matt Caswell <matt@openssl.org>
Date: Wed, 12 Oct 2016 15:21:13 +0000 (+0100)
Subject: Control building of ossl_shim through Configure
X-Git-Tag: OpenSSL_1_1_1-pre1~3248
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce2596d404c16266b6bd5614b2d5159b67054d58;p=oweals%2Fopenssl.git

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 70ae456db7..3289e9f1a7 100755
--- 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 a3932258c0..e31431bfbe 100644
--- 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 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