From b273fcc565fbe90b1f9d2526640fcc55832bbeb6 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 4 May 2016 10:13:15 +0100 Subject: 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 --- test/recipes/70-test_sslcertstatus.t | 3 +++ test/recipes/70-test_sslextension.t | 3 +++ test/recipes/70-test_sslsessiontick.t | 3 +++ test/recipes/70-test_sslskewith0p.t | 3 +++ test/recipes/70-test_sslvertol.t | 3 +++ test/recipes/70-test_tlsextms.t | 3 +++ 6 files changed, 18 insertions(+) (limited to 'test') 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($$$$$); -- cgit v1.2.3