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/run_tests.pl | |
| 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/run_tests.pl')
| -rw-r--r-- | test/run_tests.pl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/run_tests.pl b/test/run_tests.pl index c914783274..f7bd623856 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -7,10 +7,11 @@ use File::Spec::Functions qw/catdir catfile curdir abs2rel rel2abs/; use File::Basename; use Test::Harness qw/runtests $switches/; -my $top = $ENV{TOP}; -my $recipesdir = catdir($top, "test", "recipes"); -my $testlib = catdir($top, "test", "testlib"); -my $utillib = catdir($top, "util"); +my $srctop = $ENV{SRCTOP} || $ENV{TOP}; +my $bldtop = $ENV{BLDTOP} || $ENV{TOP}; +my $recipesdir = catdir($srctop, "test", "recipes"); +my $testlib = catdir($srctop, "test", "testlib"); +my $utillib = catdir($srctop, "util"); # It seems that $switches is getting interpreted with 'eval' or something # like that, and that we need to take care of backslashes or they will |