From 144428dcaa1356e19bebba42a7c41caae35c65bb Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 17 Jan 2018 11:30:37 +0100 Subject: [PATCH] Enable TLSProxy tests on Windows Reviewed-by: Bernd Edlinger (Merged from https://github.com/openssl/openssl/pull/5096) --- test/recipes/70-test_sslcbcpadding.t | 2 +- test/recipes/70-test_sslcertstatus.t | 2 +- test/recipes/70-test_sslextension.t | 2 +- test/recipes/70-test_sslmessages.t | 2 +- test/recipes/70-test_sslrecords.t | 2 +- test/recipes/70-test_sslsessiontick.t | 2 +- test/recipes/70-test_sslskewith0p.t | 2 +- test/recipes/70-test_sslvertol.t | 2 +- test/recipes/70-test_tlsextms.t | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/recipes/70-test_sslcbcpadding.t b/test/recipes/70-test_sslcbcpadding.t index fdaa46680c..b497a4c442 100644 --- a/test/recipes/70-test_sslcbcpadding.t +++ b/test/recipes/70-test_sslcbcpadding.t @@ -15,7 +15,7 @@ my $test_name = "test_sslcbcpadding"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index f700f92885..061ee72073 100644 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -15,7 +15,7 @@ my $test_name = "test_sslcertstatus"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index 7f69f649b3..f23db81955 100644 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -15,7 +15,7 @@ my $test_name = "test_sslextension"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t index 3acbac141f..ca8bc952ef 100644 --- a/test/recipes/70-test_sslmessages.t +++ b/test/recipes/70-test_sslmessages.t @@ -15,7 +15,7 @@ my $test_name = "test_tls13messages"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslrecords.t b/test/recipes/70-test_sslrecords.t index 83f59b2ac3..9ff169ccf9 100644 --- a/test/recipes/70-test_sslrecords.t +++ b/test/recipes/70-test_sslrecords.t @@ -15,7 +15,7 @@ my $test_name = "test_sslrecords"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 89ef12f75b..be6c1c78de 100644 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -16,7 +16,7 @@ my $test_name = "test_sslsessiontick"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index bfdee8b739..3fb19fc7e8 100644 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -15,7 +15,7 @@ my $test_name = "test_sslskewith0p"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index f8c94e91df..7c47447121 100644 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -15,7 +15,7 @@ my $test_name = "test_sslextension"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 1248594c06..f11c97e525 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -16,7 +16,7 @@ my $test_name = "test_tlsextms"; setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" - if $^O =~ /^(VMS|MSWin32)$/; + if $^O =~ /^(VMS)$/; plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -- 2.25.1