[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  11b3313c2fbd27303371cd49c5de83525d8986ce (commit)
      from  8e8b883f6b51a88360368724fd6a96a363eaa92a (commit)


- Log -----------------------------------------------------------------
commit 11b3313c2fbd27303371cd49c5de83525d8986ce
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jan 14 17:38:52 2016 +0100

    In __cwd, make sure the given directory is seen as such and not a file
    
    On Unixly platforms, this doesn't matter.  On VMS, it does.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/testlib/OpenSSL/Test.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 6af5e96..e4218c5 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -87,7 +87,6 @@ sub __cwd;
 sub __apps_file;
 sub __results_file;
 sub __test_log;
-sub __cwd;
 sub __fixup_cmd;
 sub __build_cmd;
 
@@ -607,7 +606,7 @@ sub __test_log {
 }
 
 sub __cwd {
-    my $dir = shift;
+    my $dir = catdir(shift);
     my %opts = @_;
     my $abscurdir = rel2abs(curdir());
     my $absdir = rel2abs($dir);