提交 b273fcc5 编写于 作者: M Matt Caswell

Fix the no-tls option

The TLSProxy based tests don't work when TLS is disabled so we shouldn't
run them.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 ea837d79
...@@ -26,6 +26,9 @@ plan skip_all => "$test_name needs the sock feature enabled" ...@@ -26,6 +26,9 @@ plan skip_all => "$test_name needs the sock feature enabled"
plan skip_all => "$test_name needs the ocsp feature enabled" plan skip_all => "$test_name needs the ocsp feature enabled"
if disabled("ocsp"); if disabled("ocsp");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&certstatus_filter, \&certstatus_filter,
......
...@@ -23,6 +23,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" ...@@ -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" plan skip_all => "$test_name needs the sock feature enabled"
if disabled("sock"); if disabled("sock");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&extension_filter, \&extension_filter,
......
...@@ -24,6 +24,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" ...@@ -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" plan skip_all => "$test_name needs the sock feature enabled"
if disabled("sock"); if disabled("sock");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$$); sub checkmessages($$$$$$);
......
...@@ -26,6 +26,9 @@ plan skip_all => "dh is not supported by this OpenSSL build" ...@@ -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" plan skip_all => "$test_name needs the sock feature enabled"
if disabled("sock"); if disabled("sock");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&ske_0_p_filter, \&ske_0_p_filter,
......
...@@ -23,6 +23,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" ...@@ -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" plan skip_all => "$test_name needs the sock feature enabled"
if disabled("sock"); if disabled("sock");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
my $proxy = TLSProxy::Proxy->new( my $proxy = TLSProxy::Proxy->new(
\&vers_tolerance_filter, \&vers_tolerance_filter,
......
...@@ -24,6 +24,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" ...@@ -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" plan skip_all => "$test_name needs the sock feature enabled"
if disabled("sock"); if disabled("sock");
plan skip_all => "$test_name needs TLS enabled"
if alldisabled(available_protocols("tls"));
$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
sub checkmessages($$$$$); sub checkmessages($$$$$);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册