The branch master has been updated via 3f22ed2fcf83a6306f4a06307278c779e49ba3df (commit) from 8e237299b0357091dae8e7175cbfa11f4fbc98c7 (commit)
- Log ----------------------------------------------------------------- commit 3f22ed2fcf83a6306f4a06307278c779e49ba3df Author: Richard Levitte <levi...@openssl.org> Date: Sun Jan 17 00:25:44 2016 +0100 The TLSProxy tests can't run if no-engine has been configured Make sure they detect that. Reviewed-by: Viktor Dukhovni <vik...@openssl.org> ----------------------------------------------------------------------- Summary of changes: 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 0be0ccb..65a5ec1 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 f0b465d..29cff45 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 4cac255..84fc4df 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 b20157f..c31ea0d 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 031dd9a..d626763 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 763f7e8..b6ff47e 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=/ } _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits