Commit b273fcc5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix the no-tls option 



The TLSProxy based tests don't work when TLS is disabled so we shouldn't
run them.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent ea837d79

test/recipes/70-test_sslcertstatus.t

+3 −0
Original line number Diff line number Diff line
@@ -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,

test/recipes/70-test_sslextension.t

+3 −0
Original line number Diff line number Diff line
@@ -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,

test/recipes/70-test_sslsessiontick.t

+3 −0
Original line number Diff line number Diff line
@@ -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($$$$$$);

test/recipes/70-test_sslskewith0p.t

+3 −0
Original line number Diff line number Diff line
@@ -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,

test/recipes/70-test_sslvertol.t

+3 −0
Original line number Diff line number Diff line
@@ -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,