[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  612539e8a678c6099131dfd0e5e4b85fa774eb1a (commit)
      from  4ff5b41af15ce731f03bbb43250c8ef1ed88b513 (commit)


- Log -----------------------------------------------------------------
commit 612539e8a678c6099131dfd0e5e4b85fa774eb1a
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 21 07:53:40 2020 +0100

    OpenSSL::Test: bring back the relative paths
    
    Because there was a bug in File::Spec::Unix' abs2rel when it was given
    relative paths as both PATH and BASE arguments, the directories we
    deal with were made to be all absolute.  Unfortunately, this meant
    getting paths in our verbose test output which are difficult to use
    anywhere else (such as a separate test build made for comparison), due
    to the constant need to edit all the paths all the time.
    
    We're therefore getting back the relative paths, by doing an extra
    abs2rel() in __srctop_file, __srctop_dir, __bldtop_file and
    __bldtop_dir, with a 'Cwd::getcwd' call as BASE argument.
    
    Fixes #10628
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10913)

-----------------------------------------------------------------------

Summary of changes:
 util/perl/OpenSSL/Test.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index 9f72b66822..78e13523c8 100644
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -66,7 +66,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/;
+use Cwd qw/getcwd abs_path/;
 
 my $level = 0;
 
@@ -977,26 +977,26 @@ sub __srctop_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
     my $f = pop;
-    return catfile($directories{SRCTOP}, at _,$f);
+    return abs2rel(catfile($directories{SRCTOP}, at _,$f),getcwd);
 }
 
 sub __srctop_dir {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    return catdir($directories{SRCTOP}, at _);
+    return abs2rel(catdir($directories{SRCTOP}, at _), getcwd);
 }
 
 sub __bldtop_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
     my $f = pop;
-    return catfile($directories{BLDTOP}, at _,$f);
+    return abs2rel(catfile($directories{BLDTOP}, at _,$f), getcwd);
 }
 
 sub __bldtop_dir {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    return catdir($directories{BLDTOP}, at _);
+    return abs2rel(catdir($directories{BLDTOP}, at _), getcwd);
 }
 
 # __exeext is a function that returns the platform dependent file extension