diff options
author | Matt Caswell <matt@openssl.org> | 2016-03-21 15:32:40 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-03-21 16:33:59 +0000 |
commit | f9e550341281b0d344f7a5e7ac2ace79f88a3184 (patch) | |
tree | 92d80d122c6d3c1eee39ffdd08cfe1980a657095 /test/recipes | |
parent | 168c3b737e898ce97348dfe77ef176e39ae9da0d (diff) |
Fix no-sock
Misc fixes for no-sock
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/recipes')
-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 | ||||
-rw-r--r-- | test/recipes/80-test_ssl.t | 4 | ||||
-rw-r--r-- | test/recipes/90-test_networking.t | 3 |
8 files changed, 23 insertions, 2 deletions
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 37265ed07a..48014e2af3 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -66,6 +66,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $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 1641daa344..92c6762ffc 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -66,6 +66,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $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 caab77745e..704573881c 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -67,6 +67,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$$); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index b0cc9ffb59..0bed4bffbb 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -69,6 +69,9 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "dh is not supported by this OpenSSL build" if disabled("dh"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $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 0795733fb9..a3285a67dd 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -66,6 +66,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $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 bc3b787800..5c41a908a2 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -67,6 +67,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$); diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t index da32fac6c7..f1ffe9a01c 100644 --- a/test/recipes/80-test_ssl.t +++ b/test/recipes/80-test_ssl.t @@ -435,14 +435,14 @@ sub testssl { SKIP: { skip "No IPv4 available on this machine", 1 - unless have_IPv4(); + unless !disabled("sock") && have_IPv4(); ok(run(test([@ssltest, "-ipv4", @extra])), 'test TLS via IPv4'); } SKIP: { skip "No IPv6 available on this machine", 1 - unless have_IPv6(); + unless !disabled("sock") && have_IPv6(); ok(run(test([@ssltest, "-ipv6", @extra])), 'test TLS via IPv6'); } diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index 5d876ca51c..408d89af6a 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -66,6 +66,9 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( |