From 90d48e5ea006c759888f7302ccc94fede3ca224a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 26 Jan 2016 02:11:55 +0100 Subject: [PATCH] Use the new OpenSSL::Test::Utils routines. Reviewed-by: Viktor Dukhovni --- test/recipes/70-test_sslcertstatus.t | 2 +- test/recipes/70-test_sslextension.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 +- test/recipes/80-test_ssl.t | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index f7c6363cbb..814ca0abf1 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -67,7 +67,7 @@ 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" - if config("no_shared"); + if disabled("shared"); $ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index 31632a717a..3c9caadb97 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -67,7 +67,7 @@ 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" - if config("no_shared"); + if disabled("shared"); $ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 84ab66199d..7e5ccad5aa 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -68,7 +68,7 @@ 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" - if config("no_shared"); + if disabled("shared"); $ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 39c0409427..8261238f00 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -67,7 +67,7 @@ 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" - if config("no_shared"); + if disabled("shared"); plan skip_all => "dh is not supported by this OpenSSL build" if disabled("dh"); diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index c711d86fb5..e5eef31bc4 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -67,7 +67,7 @@ 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" - if config("no_shared"); + if disabled("shared"); $ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index a861064ee1..8e3b41434e 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -68,7 +68,7 @@ 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" - if config("no_shared"); + if disabled("shared"); $ENV{OPENSSL_ENGINES} = top_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t index 54259e1b2c..e7472a208b 100644 --- a/test/recipes/80-test_ssl.t +++ b/test/recipes/80-test_ssl.t @@ -14,11 +14,11 @@ setup("test_ssl"); my ($no_rsa, $no_dsa, $no_dh, $no_ec, $no_srp, $no_psk, $no_ssl3, $no_tls1, $no_tls1_1, $no_tls1_2, $no_dtls, $no_dtls1, $no_dtls1_2) = - disabled qw/rsa dsa dh ec srp psk - ssl3 tls1 tls1_1 tls1_2 - dtls dtls1 dtls1_2/; -my $no_anytls = $no_ssl3 && $no_tls1 && $no_tls1_1 && $no_tls1_2; -my $no_anydtls = $no_dtls && $no_dtls1 && $no_dtls1_2; + anydisabled qw/rsa dsa dh ec srp psk + ssl3 tls1 tls1_1 tls1_2 + dtls dtls1 dtls1_2/; +my $no_anytls = alldisabled(available_protocols("tls")); +my $no_anydtls = alldisabled(available_protocols("dtls")); plan skip_all => "No SSL/TLS/DTLS protocol is support by this OpenSSL build" if $no_anytls && $no_anydtls; -- 2.34.1