[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  3732f12c668421b229eddcc1b3af2a4806ec9865 (commit)
      from  9a2d2fb338d67d3001aebcb2aa8e11d0fd7d2f80 (commit)


- Log -----------------------------------------------------------------
commit 3732f12c668421b229eddcc1b3af2a4806ec9865
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed May 4 23:42:57 2016 +0200

    testlib/OpenSSL/Test.pm: address 5.10 warnings.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/testlib/OpenSSL/Test.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index f2d0c9b..8a7d0a0 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -735,8 +735,8 @@ sub __exeext {
 sub __test_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    my $f = pop . __exeext();
-    $f = catfile($directories{BLDTEST}, at _,$f);
+    my $f = pop;
+    $f = catfile($directories{BLDTEST}, at _,$f . __exeext());
     $f = catfile($directories{SRCTEST}, at _,$f) unless -x $f;
     return $f;
 }
@@ -753,8 +753,8 @@ sub __perltest_file {
 sub __apps_file {
     BAIL_OUT("Must run setup() first") if (! $test_name);
 
-    my $f = pop . __exeext();
-    $f = catfile($directories{BLDAPPS}, at _,$f);
+    my $f = pop;
+    $f = catfile($directories{BLDAPPS}, at _,$f . __exeext());
     $f = catfile($directories{SRCAPPS}, at _,$f) unless -x $f;
     return $f;
 }