Commit 380ebcc8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Fix util/perl/OpenSSL/Test.pm input variable overwrite 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4507)

(cherry picked from commit 9b9a8a71)
parent 8bd108a0

test/testlib/OpenSSL/Test.pm

+15 −15
Original line number Diff line number Diff line
@@ -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 {