Commit cb6afcd6 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4069)
parent c4d2e483

Configure

+6 −3
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
use 5.10.0;

use strict;

use Config;

use FindBin;

use lib "$FindBin::Bin/util/perl";

use File::Basename;

use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;

use File::Path qw/mkpath/;
@@ -1384,7 +1386,6 @@ my %unified_info = (); 


my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO});

if ($builder eq "unified") {

    use lib catdir(dirname(__FILE__),"util");

    use with_fallback qw(Text::Template);



    sub cleandir {
@@ -1512,8 +1513,10 @@ if ($builder eq "unified") { 
        my %generate = ();



        push @{$config{build_infos}}, catfile(abs2rel($sourced, $blddir), $f);

        my $template = Text::Template->new(TYPE => 'FILE',

                                           SOURCE => catfile($sourced, $f));

        my $template =

            Text::Template->new(TYPE => 'FILE',

                                SOURCE => catfile($sourced, $f),

                                PREPEND => qq{use lib "$FindBin::Bin/util/perl";});

        die "Something went wrong with $sourced/$f: $!\n" unless $template;

        my @text =

            split /^/m,

test/generate_ssl_tests.pl

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ BEGIN { 
    OpenSSL::Test::setup("no_test_here");

}



use lib srctop_dir("util");  # for with_fallback

use lib srctop_dir("util", "perl");  # for with_fallback

use lib srctop_dir("test", "ssl-tests");  # for ssltests_base



use with_fallback qw(Text::Template);

test/recipes/80-test_ssl_new.t

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ sub test_conf { 


      skip 'failure', 2 unless

        ok(run(perltest(["generate_ssl_tests.pl", $input_file],

                        interpreter_args => [ "-I", srctop_dir("test", "testlib")],

                        interpreter_args => [ "-I", srctop_dir("util", "perl")],

                        stdout => $tmp_file)),

           "Getting output from generate_ssl_tests.pl.");

test/recipes/tconversion.pl

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ use warnings; 


use File::Compare qw/compare_text/;

use File::Copy;

use lib 'testlib';

use OpenSSL::Test qw/:DEFAULT/;



my %conversionforms = (

test/run_tests.pl

+2 −3
Original line number Diff line number Diff line
@@ -25,12 +25,11 @@ my $TAP_Harness = can_load(modules => { 'TAP::Harness' => undef }) 
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

    );