Commit 374cab63 authored by Martin Peylo's avatar Martin Peylo Committed by Richard Levitte
Browse files

Adding Test.pm with workaround for Perl abs2rel bug 



If SRCTOP != BLDTOP, and SRCTOP is given in relative form, e.g.
"./config ../openssl", then a bug in Perl's abs2rel may trigger that directory-
rewriting in __cwd results in wrong entries in %directories under certain
circumstances, e.g. when a test executes run(app(["openssl"]) after indir.

There should not be any need to go to a higher directory from BLDDIR or SRCDIR,
so it should be OK to use them in their absolute form, also resolving all
possible symlinks, right from the start.

Following the File::Spec::Functions bug description (reported to perl.org):

When abs2rel gets a path argument with ..s that are crossing over the ..s
trailing the base argument, the result is wrong.

Example
PATH: /home/goal/test/..
BASE: /home/goal/test/../../base
Good result: ../goal
Bad  result: ../..

Bug verified with File::Spec versions
- 3.6301
- 3.74 (latest)

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7031)

(cherry picked from commit 7a2027240e1d01f7f5b209998d1de36af221b34b)
parent 42180a22

util/perl/OpenSSL/Test.pm

+3 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir 
                             rel2abs/;

use File::Path 2.00 qw/rmtree mkpath/;

use File::Basename;

use Cwd qw/abs_path/;



my $level = 0;
@@ -869,8 +870,8 @@ failures will result in a C<BAIL_OUT> at the end of its run. 
sub __env {

    (my $recipe_datadir = basename($0)) =~ s/\.t$/_data/i;



    $directories{SRCTOP}  = $ENV{SRCTOP} || $ENV{TOP};

    $directories{BLDTOP}  = $ENV{BLDTOP} || $ENV{TOP};

    $directories{SRCTOP}  = abs_path($ENV{SRCTOP} || $ENV{TOP});

    $directories{BLDTOP}  = abs_path($ENV{BLDTOP} || $ENV{TOP});

    $directories{BLDAPPS} = $ENV{BIN_D}  || __bldtop_dir("apps");

    $directories{SRCAPPS} =                 __srctop_dir("apps");

    $directories{BLDFUZZ} =                 __bldtop_dir("fuzz");