From: Richard Levitte <levitte@openssl.org>
Date: Wed, 12 Oct 2016 15:05:06 +0000 (+0100)
Subject: Integrate ossl_shim into the build
X-Git-Tag: OpenSSL_1_1_1-pre1~3249
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cfa76979867a2401d435cafe66e05c4234785480;p=oweals%2Fopenssl.git

Integrate ossl_shim into the build

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/Configure b/Configure
index 884f7bd1db..70ae456db7 100755
--- a/Configure
+++ b/Configure
@@ -316,6 +316,8 @@ $config{sdirs} = [
     "evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
     "cms", "ts", "srp", "cmac", "ct", "async", "kdf"
     ];
+# test/ subdirectories to build
+$config{tdirs} = [ "ossl_shim" ];
 
 # Known TLS and DTLS protocols
 my @tls = qw(ssl3 tls1 tls1_1 tls1_2 tls1_3);
@@ -1426,6 +1428,10 @@ if ($builder eq "unified") {
         push @build_infos, [ catdir("engines", $_), "build.info" ]
             if (-f catfile($srcdir, "engines", $_, "build.info"));
     }
+    foreach (@{$config{tdirs}}) {
+        push @build_infos, [ catdir("test", $_), "build.info" ]
+            if (-f catfile($srcdir, "test", $_, "build.info"));
+    }
 
     $config{build_infos} = [ ];
 
diff --git a/test/ossl_shim/build.info b/test/ossl_shim/build.info
new file mode 100644
index 0000000000..b669d61d32
--- /dev/null
+++ b/test/ossl_shim/build.info
@@ -0,0 +1,6 @@
+IF[{- defined $target{cxx} -}]
+  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
+  DEPEND[ossl_shim]=../../libssl ../../libcrypto
+ENDIF