From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Jan 2016 16:38:52 +0000 (+0100)
Subject: In __cwd, make sure the given directory is seen as such and not a file
X-Git-Tag: OpenSSL_1_1_0-pre3~532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11b3313c2fbd27303371cd49c5de83525d8986ce;p=openssl

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@openssl.org>
---

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 6af5e963fc..e4218c55f5 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);