diff options
author | Richard Levitte <levitte@openssl.org> | 2016-03-05 15:11:37 +0300 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-17 12:10:59 +0300 |
commit | a717738b45fa7ae90cf3dac0870b8d1ea2a8e173 (patch) | |
tree | 930272dba40ea23bd8bbfaa612e693b674a291ca /test/recipes | |
parent | 909289dfc31ca7b02652e3e9ed4e2df754fd258f (diff) |
Don't define OPENSSL_ENGINES in test recipes, do it in Makefiles instead
In most builds, we can assume that engines live in the build tree
subdirectory "engines". This was hard coded into the tests that use
the engine ossltest.
However, that hard coding is tedious, it would need to be done in
every test recipe, and it's an incorrect assumption in some cases.
This change has us play it safe and let the build files tell the
testing framework where the engines are.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'test/recipes')
-rwxr-xr-x | test/recipes/70-test_sslcertstatus.t | 1 | ||||
-rwxr-xr-x | test/recipes/70-test_sslextension.t | 1 | ||||
-rwxr-xr-x | test/recipes/70-test_sslsessiontick.t | 1 | ||||
-rwxr-xr-x | test/recipes/70-test_sslskewith0p.t | 1 | ||||
-rwxr-xr-x | test/recipes/70-test_sslvertol.t | 1 | ||||
-rw-r--r-- | test/recipes/70-test_tlsextms.t | 1 | ||||
-rw-r--r-- | test/recipes/90-test_networking.t | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t index 216804ce2b..37265ed07a 100755 --- a/test/recipes/70-test_sslcertstatus.t +++ b/test/recipes/70-test_sslcertstatus.t @@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&certstatus_filter, diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t index f9a6573cc8..1641daa344 100755 --- a/test/recipes/70-test_sslextension.t +++ b/test/recipes/70-test_sslextension.t @@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&extension_filter, diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index 56ae4c0cba..caab77745e 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -67,7 +67,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$$); diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 90fcf30711..b0cc9ffb59 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -69,7 +69,6 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled" plan skip_all => "dh is not supported by this OpenSSL build" if disabled("dh"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&ske_0_p_filter, diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index d436b5aba7..0795733fb9 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&vers_tolerance_filter, diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 47a03213c8..bc3b787800 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -67,7 +67,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$); diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t index 16ece75be0..5d876ca51c 100644 --- a/test/recipes/90-test_networking.t +++ b/test/recipes/90-test_networking.t @@ -66,7 +66,6 @@ plan skip_all => "TLSProxy isn't usable on $^O" plan skip_all => "$test_name needs the dynamic engine feature enabled" if disabled("engine") || disabled("dynamic-engine"); -$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( |