diff options
author | Richard Levitte <levitte@openssl.org> | 2016-01-30 01:05:33 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-02-09 11:43:20 +0100 |
commit | 42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3 (patch) | |
tree | 32b3a8b198c14f54ad5138598ae543dac45d2446 /test/recipes/70-test_sslskewith0p.t | |
parent | d7465918867b107058228938e7f5c9fa032ef708 (diff) | |
download | openssl-42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3.tar.gz |
unified build scheme: adjust test framework for out of source build tree
To be able to run tests when we've built in a directory other than
the source tree, the testing framework needs a few adjustments.
test/testlib/OpenSSL/Test.pm needs to know where it can find
shlib_wrap.sh, and a number of other tests need to be told a different
place to find engines than what they may be able to figure out on
their own. Relying to $TOP is not enough, $SRCTOP and $BLDTOP can be
used as an alternative.
As part of this change, top_file and top_dir are removed and
srctop_file, bldtop_file, srctop_dir and bldtop_dir take their place.
Reviewed-by: Ben Laurie <ben@openssl.org>
Diffstat (limited to 'test/recipes/70-test_sslskewith0p.t')
-rwxr-xr-x | test/recipes/70-test_sslskewith0p.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t index 8261238f00..0e6a780404 100755 --- a/test/recipes/70-test_sslskewith0p.t +++ b/test/recipes/70-test_sslskewith0p.t @@ -53,7 +53,7 @@ # Hudson (tjh@cryptsoft.com). use strict; -use OpenSSL::Test qw/:DEFAULT cmdstr top_file top_dir/; +use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/; use OpenSSL::Test::Utils; use TLSProxy::Proxy; @@ -72,12 +72,12 @@ plan skip_all => "$test_name can only be performed with OpenSSL configured share plan skip_all => "dh is not supported by this OpenSSL build" if disabled("dh"); -$ENV{OPENSSL_ENGINES} = top_dir("engines"); +$ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; my $proxy = TLSProxy::Proxy->new( \&ske_0_p_filter, cmdstr(app(["openssl"])), - top_file("apps", "server.pem") + srctop_file("apps", "server.pem") ); plan tests => 1; |