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/80-test_ca.t | |
| parent | d7465918867b107058228938e7f5c9fa032ef708 (diff) | |
| download | openssl-42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3.zip openssl-42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3.tar.gz openssl-42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3.tar.bz2 | |
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/80-test_ca.t')
| -rw-r--r-- | test/recipes/80-test_ca.t | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t index e97a83f..97e44c8 100644 --- a/test/recipes/80-test_ca.t +++ b/test/recipes/80-test_ca.t @@ -5,24 +5,24 @@ use warnings; use POSIX; use File::Path 2.00 qw/remove_tree/; -use OpenSSL::Test qw/:DEFAULT cmdstr top_file/; +use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file/; setup("test_ca"); $ENV{OPENSSL} = cmdstr(app(["openssl"])); -my $std_openssl_cnf = $^O eq "VMS" - ? top_file("apps", "openssl-vms.cnf") : top_file("apps", "openssl.cnf"); +my $std_openssl_cnf = + srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf"); remove_tree("demoCA", { safe => 0 }); plan tests => 4; SKIP: { - $ENV{OPENSSL_CONFIG} = "-config ".top_file("test", "CAss.cnf"); + $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "CAss.cnf"); skip "failed creating CA structure", 3 if !ok(run(perlapp(["CA.pl","-newca"], stdin => undef, stderr => undef)), 'creating CA structure'); - $ENV{OPENSSL_CONFIG} = "-config ".top_file("test", "Uss.cnf"); + $ENV{OPENSSL_CONFIG} = "-config ".srctop_file("test", "Uss.cnf"); skip "failed creating new certificate request", 2 if !ok(run(perlapp(["CA.pl","-newreq"], stderr => undef)), 'creating CA structure'); @@ -49,3 +49,4 @@ sub yes { close PIPE; return 0; } + |