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/25-test_req.t | |
parent | d7465918867b107058228938e7f5c9fa032ef708 (diff) |
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/25-test_req.t')
-rw-r--r-- | test/recipes/25-test_req.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t index ce1f869e2b..fac97719e6 100644 --- a/test/recipes/25-test_req.t +++ b/test/recipes/25-test_req.t @@ -4,15 +4,15 @@ use strict; use warnings; use File::Spec; -use OpenSSL::Test qw/:DEFAULT top_file/; +use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_req"); plan tests => 3; -require_ok(top_file('test','recipes','tconversion.pl')); +require_ok(srctop_file('test','recipes','tconversion.pl')); -my @openssl_args = ("req", "-config", "../apps/openssl.cnf"); +my @openssl_args = ("req", "-config", srctop_file("apps", "openssl.cnf")); run_conversion('req conversions', "testreq.pem"); |