commit cb6afcd6ee0c0d66fae62e13fe5966171992f81c
author Richard Levitte <levitte@openssl.org> Tue Aug 01 22:10:39 2017 +0200
committer Richard Levitte <levitte@openssl.org> Tue Aug 15 11:30:47 2017 +0200
tree 5b793c0d2a0e92233919fcaaa314c70cf32430d2
parent c4d2e483a39176a476c56d35879423fe6e33c0cd

Consolidate the locations where we have our internal perl modules

Instead of having perl modules under test/testlib, util and util/perl,
consolidate them all to be inside util/perl.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4069)

test/run_tests.pl

diff --git a/test/run_tests.pl b/test/run_tests.pl
index 1695729..1171eec 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -25,12 +25,11 @@
 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");
+my $libdir = rel2abs(catdir($srctop, "util", "perl"));
 
 my %tapargs =
     ( verbosity => $ENV{VERBOSE} || $ENV{V} || $ENV{HARNESS_VERBOSE} ? 1 : 0,
-      lib       => [ $testlib, $utillib ],
+      lib       => [ $libdir ],
       switches  => '-w',
       merge     => 1
     );