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>

1 files changed, 5 insertions, 5 deletions

diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index e2d795a6c4..1572a06d71 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -4,20 +4,20 @@ use strict;
 use warnings;
 
 use File::Spec;
-use OpenSSL::Test qw/:DEFAULT top_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_x509");
 
 plan tests => 4;
 
-require_ok(top_file('test','recipes','tconversion.pl'));
+require_ok(srctop_file('test','recipes','tconversion.pl'));
 
 subtest 'x509 -- x.509 v1 certificate' => sub {
-    tconversion("x509", top_file("test","testx509.pem"));
+    tconversion("x509", srctop_file("test","testx509.pem"));
 };
 subtest 'x509 -- first x.509 v3 certificate' => sub {
-    tconversion("x509", top_file("test","v3-cert1.pem"));
+    tconversion("x509", srctop_file("test","v3-cert1.pem"));
 };
 subtest 'x509 -- second x.509 v3 certificate' => sub {
-    tconversion("x509", top_file("test","v3-cert2.pem"));
+    tconversion("x509", srctop_file("test","v3-cert2.pem"));
 };