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>
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 747d7b2..9eb5116 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 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 a39320b..1084c96 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 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 1c21797..2bf19e4 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 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 263b63b..ca8dfe7 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t
@@ -26,6 +26,9 @@ 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 34c3541..af82a8c 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 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 e8fbd90..6cc04ff 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 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($$$$$);