diff options
| -rwxr-xr-x | test/recipes/70-test_sslcertstatus.t | 7 | ||||
| -rwxr-xr-x | test/recipes/70-test_sslextension.t | 7 | ||||
| -rwxr-xr-x | test/recipes/70-test_sslsessiontick.t | 7 | ||||
| -rwxr-xr-x | test/recipes/70-test_sslskewith0p.t | 7 | ||||
| -rwxr-xr-x | test/recipes/70-test_sslvertol.t | 7 | ||||
| -rw-r--r-- | test/recipes/70-test_tlsextms.t | 7 | ||||
| -rw-r--r-- | test/recipes/90-test_networking.t | 7 |
7 files changed, 14 insertions, 35 deletions
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 303de5e566..9987e79b20 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -63,11 +63,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index c253f748e0..6ad4130324 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -63,11 +63,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 4e9c85f82f..cd6e483aa7 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -64,11 +64,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index fac1e8d148..eaf37b61b4 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -63,11 +63,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); 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 e014d3f02d..f89bc87c26 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -63,11 +63,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 022b3a8d6c..27b5347feb 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -64,11 +64,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index cf3b43aa50..5297be0d07 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -63,11 +63,8 @@ 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" - if disabled("shared"); +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic_engines"); $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; |