[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  768a3eca39a78b46cfba66b731956a2d2edf4683 (commit)
      from  fc6076ca272f74eb1364c29e6974ad5da5ef9777 (commit)


- Log -----------------------------------------------------------------
commit 768a3eca39a78b46cfba66b731956a2d2edf4683
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jun 22 13:39:46 2016 +0200

    OpenSSL::Test: Fix directory calculations in __cwd()
    
    The previous fix contained a mistake, where any absolute path in
    %directories would be cleared away instead of just being left alone.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/testlib/OpenSSL/Test.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 6a10afd..31f4105 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -854,7 +854,12 @@ sub __cwd {
 	rmtree(".", { safe => 0, keep_root => 1 });
     }
 
-    %directories = %tmp_directories;
+    # We put back new values carefully.  Doing the obvious
+    # %directories = ( %tmp_irectories )
+    # will clear out any value that happens to be an absolute path
+    foreach (keys %tmp_directories) {
+        $directories{$_} = $tmp_directories{$_};
+    }
     foreach (keys %tmp_ENV) {
         $ENV{$_} = $tmp_ENV{$_};
     }