diff options
author | Richard Levitte <levitte@openssl.org> | 2016-10-12 16:05:06 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-11-04 10:38:54 +0000 |
commit | cfa76979867a2401d435cafe66e05c4234785480 (patch) | |
tree | 11b75eea6e7b6fca7765b402236865052cb94ab4 | |
parent | 50b014e4c62cb9315de949e0e84b1628142d1401 (diff) |
Integrate ossl_shim into the build
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
-rwxr-xr-x | Configure | 6 | ||||
-rw-r--r-- | test/ossl_shim/build.info | 6 |
2 files changed, 12 insertions, 0 deletions
@@ -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 |