diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-10-09 17:55:38 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-10-09 21:22:16 +0200 |
| commit | 380ebcc89776ffd7acb2b624cb95ded081e43ae4 (patch) | |
| tree | aa58ce01a472bcccacafbc0a5d05e62148b03b08 /test | |
| parent | 8bd108a0042a75cca34de4f803f6aa62299d0463 (diff) | |
Fix util/perl/OpenSSL/Test.pm input variable overwrite
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4507)
(cherry picked from commit 9b9a8a712d64e35a337b22869288f246b5580c73)
Diffstat (limited to 'test')
| -rw-r--r-- | test/testlib/OpenSSL/Test.pm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm index e9d02aaa70..f8805a6db0 100644 --- a/test/testlib/OpenSSL/Test.pm +++ b/test/testlib/OpenSSL/Test.pm @@ -793,45 +793,45 @@ sub __test_file { BAIL_OUT("Must run setup() first") if (! $test_name); my $f = pop; - $f = catfile($directories{BLDTEST},@_,$f . __exeext()); - $f = catfile($directories{SRCTEST},@_,$f) unless -x $f; - return $f; + my $out = catfile($directories{BLDTEST},@_,$f . __exeext()); + $out = catfile($directories{SRCTEST},@_,$f) unless -x $out; + return $out; } sub __perltest_file { BAIL_OUT("Must run setup() first") if (! $test_name); my $f = pop; - $f = catfile($directories{BLDTEST},@_,$f); - $f = catfile($directories{SRCTEST},@_,$f) unless -f $f; - return ($^X, $f); + my $out = catfile($directories{BLDTEST},@_,$f); + $out = catfile($directories{SRCTEST},@_,$f) unless -f $out; + return ($^X, $out); } sub __apps_file { BAIL_OUT("Must run setup() first") if (! $test_name); my $f = pop; - $f = catfile($directories{BLDAPPS},@_,$f . __exeext()); - $f = catfile($directories{SRCAPPS},@_,$f) unless -x $f; - return $f; + my $out = catfile($directories{BLDAPPS},@_,$f . __exeext()); + $out = catfile($directories{SRCAPPS},@_,$f) unless -x $out; + return $out; } sub __fuzz_file { BAIL_OUT("Must run setup() first") if (! $test_name); my $f = pop; - $f = catfile($directories{BLDFUZZ},@_,$f . __exeext()); - $f = catfile($directories{SRCFUZZ},@_,$f) unless -x $f; - return $f; + my $out = catfile($directories{BLDFUZZ},@_,$f . __exeext()); + $out = catfile($directories{SRCFUZZ},@_,$f) unless -x $out; + return $out; } sub __perlapps_file { BAIL_OUT("Must run setup() first") if (! $test_name); my $f = pop; - $f = catfile($directories{BLDAPPS},@_,$f); - $f = catfile($directories{SRCAPPS},@_,$f) unless -f $f; - return ($^X, $f); + my $out = catfile($directories{BLDAPPS},@_,$f); + $out = catfile($directories{SRCAPPS},@_,$f) unless -f $out; + return ($^X, $out); } sub __data_file { |