From 3f22ed2fcf83a6306f4a06307278c779e49ba3df Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 17 Jan 2016 00:25:44 +0100 Subject: [PATCH] The TLSProxy tests can't run if no-engine has been configured Make sure they detect that. Reviewed-by: Viktor Dukhovni --- test/recipes/70-test_sslcertstatus.t | 4 ++++ test/recipes/70-test_sslextension.t | 4 ++++ test/recipes/70-test_sslsessiontick.t | 4 ++++ test/recipes/70-test_sslskewith0p.t | 3 +++ test/recipes/70-test_sslvertol.t | 4 ++++ test/recipes/70-test_tlsextms.t | 4 ++++ 6 files changed, 23 insertions(+) diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 0be0ccbd62..65a5ec1f22 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -54,6 +54,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test::Utils; use TLSProxy::Proxy; my $test_name = "test_sslcertstatus"; @@ -62,6 +63,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index f0b465df79..29cff45ee0 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -54,6 +54,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test::Utils; use TLSProxy::Proxy; my $test_name = "test_sslextension"; @@ -62,6 +63,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 4cac25522d..84fc4df7fd 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -54,6 +54,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test::Utils; use TLSProxy::Proxy; use File::Temp qw(tempfile); @@ -63,6 +64,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index b20157f391..c31ea0ddfd 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -63,6 +63,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index 031dd9a3dc..d626763575 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -54,6 +54,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test::Utils; use TLSProxy::Proxy; my $test_name = "test_sslextension"; @@ -62,6 +63,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 763f7e8304..b6ff47e840 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -54,6 +54,7 @@ use strict; use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test::Utils; use TLSProxy::Proxy; use File::Temp qw(tempfile); @@ -63,6 +64,9 @@ setup($test_name); plan skip_all => "TLSProxy isn't usable on $^O" if $^O =~ /^VMS$/; +plan skip_all => "$test_name needs the engine feature enabled" + if disabled("engine"); + plan skip_all => "$test_name can only be performed with OpenSSL configured shared" unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ } grep { /^SHARED_LIBS=/ } -- 2.25.1