summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-22 02:06:05 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-22 14:38:31 +0100
commit19ab579060aa261bb1f7ed3dcd102471dfd556ee (patch)
tree092d99d2fb231c7c16bda0208713c680af19797b /test
parent2b9608b049eb33269f9b900e9e5f1c37fc1a1563 (diff)
Use $disabled{"dynamic-engine"} internally
We were kinda sorta using a mix of $disabled{"static-engine" and $disabled{"dynamic-engine"} in Configure. Let's avoid confusion, choose one of them and stick to it. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test')
-rwxr-xr-xtest/recipes/70-test_sslcertstatus.t2
-rwxr-xr-xtest/recipes/70-test_sslextension.t2
-rwxr-xr-xtest/recipes/70-test_sslsessiontick.t2
-rwxr-xr-xtest/recipes/70-test_sslskewith0p.t2
-rwxr-xr-xtest/recipes/70-test_sslvertol.t2
-rw-r--r--test/recipes/70-test_tlsextms.t2
-rw-r--r--test/recipes/90-test_networking.t2
7 files changed, 7 insertions, 7 deletions
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t
index 9987e79b20..ffcb279b66 100755
--- a/test/recipes/70-test_sslcertstatus.t
+++ b/test/recipes/70-test_sslcertstatus.t
@@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$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 6ad4130324..93bb6fee7f 100755
--- a/test/recipes/70-test_sslextension.t
+++ b/test/recipes/70-test_sslextension.t
@@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$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 cd6e483aa7..16ef4ea6e9 100755
--- a/test/recipes/70-test_sslsessiontick.t
+++ b/test/recipes/70-test_sslsessiontick.t
@@ -65,7 +65,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$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 eaf37b61b4..850820d190 100755
--- a/test/recipes/70-test_sslskewith0p.t
+++ b/test/recipes/70-test_sslskewith0p.t
@@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
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 f89bc87c26..02c9a3b393 100755
--- a/test/recipes/70-test_sslvertol.t
+++ b/test/recipes/70-test_sslvertol.t
@@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$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 27b5347feb..763b0af61d 100644
--- a/test/recipes/70-test_tlsextms.t
+++ b/test/recipes/70-test_tlsextms.t
@@ -65,7 +65,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$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 5297be0d07..84d616d778 100644
--- a/test/recipes/90-test_networking.t
+++ b/test/recipes/90-test_networking.t
@@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
if $^O =~ /^VMS$/;
plan skip_all => "$test_name needs the dynamic engine feature enabled"
- if disabled("engine") || disabled("dynamic_engines");
+ if disabled("engine") || disabled("dynamic-engine");
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';