From 42e0ccdfe851c9a153d3e90746a2b8561dc9b1e3 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 30 Jan 2016 01:05:33 +0100 Subject: 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 --- test/recipes/25-test_pkcs7.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/recipes/25-test_pkcs7.t') diff --git a/test/recipes/25-test_pkcs7.t b/test/recipes/25-test_pkcs7.t index 3a4dbb47bd..6e9b397175 100644 --- a/test/recipes/25-test_pkcs7.t +++ b/test/recipes/25-test_pkcs7.t @@ -4,17 +4,17 @@ use strict; use warnings; use File::Spec; -use OpenSSL::Test qw/:DEFAULT top_file/; +use OpenSSL::Test qw/:DEFAULT srctop_file/; setup("test_pkcs7"); plan tests => 3; -require_ok(top_file('test','recipes','tconversion.pl')); +require_ok(srctop_file('test','recipes','tconversion.pl')); subtest 'pkcs7 conversions -- pkcs7' => sub { - tconversion("p7", top_file("test", "testp7.pem"), "pkcs7"); + tconversion("p7", srctop_file("test", "testp7.pem"), "pkcs7"); }; subtest 'pkcs7 conversions -- pkcs7d' => sub { - tconversion("p7d", top_file("test", "pkcs7-1.pem"), "pkcs7"); + tconversion("p7d", srctop_file("test", "pkcs7-1.pem"), "pkcs7"); }; -- cgit v1.2.3