diff options
author | Matt Caswell <matt@openssl.org> | 2016-05-04 10:13:15 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-05-04 10:20:02 +0100 |
commit | b273fcc565fbe90b1f9d2526640fcc55832bbeb6 (patch) | |
tree | a8ec98d33bef649650101875786f80f0632e3289 | |
parent | ea837d79f91f481d7b07ea7a985b35c24e9dcc79 (diff) | |
download | openssl-b273fcc565fbe90b1f9d2526640fcc55832bbeb6.tar.gz |
Fix the no-tls option
The TLSProxy based tests don't work when TLS is disabled so we shouldn't
run them.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rwxr-xr-x | test/recipes/70-test_sslcertstatus.t | 3 | ||||
-rwxr-xr-x | test/recipes/70-test_sslextension.t | 3 | ||||
-rwxr-xr-x | test/recipes/70-test_sslsessiontick.t | 3 | ||||
-rwxr-xr-x | test/recipes/70-test_sslskewith0p.t | 3 | ||||
-rwxr-xr-x | test/recipes/70-test_sslvertol.t | 3 | ||||
-rw-r--r-- | test/recipes/70-test_tlsextms.t | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 747d7b2d7f..9eb5116e7c 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -26,6 +26,9 @@ plan skip_all => "$test_name needs the sock feature enabled" plan skip_all => "$test_name needs the ocsp feature enabled" if disabled("ocsp"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&certstatus_filter, diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index a39320b31a..1084c9674d 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -23,6 +23,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "$test_name needs the sock feature enabled" if disabled("sock"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&extension_filter, diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 1c2179725a..2bf19e4306 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -24,6 +24,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "$test_name needs the sock feature enabled" if disabled("sock"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$$); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 263b63bb2e..ca8dfe7681 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -26,6 +26,9 @@ plan skip_all => "dh is not supported by this OpenSSL build" plan skip_all => "$test_name needs the sock feature enabled" if disabled("sock"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&ske_0_p_filter, diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index 34c35419ae..af82a8c121 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -23,6 +23,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "$test_name needs the sock feature enabled" if disabled("sock"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&vers_tolerance_filter, diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index e8fbd90a66..6cc04ff7c9 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -24,6 +24,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "$test_name needs the sock feature enabled" if disabled("sock"); +plan skip_all => "$test_name needs TLS enabled" + if alldisabled(available_protocols("tls")); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$); |