Commit fa657fc8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make OpenSSL::Test::setup() a bit more forgiving 



It was unexpected that OpenSSL::Test::setup() should be called twice
by the same recipe.  However, that may happen if a recipe combines
OpenSSL::Test and OpenSSL::Test::Simple, which can be a sensible thing
to do.  Therefore, we now allow it.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent db922318

test/testlib/OpenSSL/Test.pm

+8 −2
Original line number Diff line number Diff line
@@ -121,9 +121,15 @@ is defined). 
=cut



sub setup {

    my $old_test_name = $test_name;

    $test_name = shift;



    BAIL_OUT("setup() must receive a name") unless $test_name;

    warn "setup() detected test name change.  Innocuous, so we continue...\n"

        if $old_test_name && $old_test_name ne $test_name;



    return if $old_test_name;



    BAIL_OUT("setup() needs \$TOP or \$SRCTOP and \$BLDTOP to be defined")

        unless $ENV{TOP} || ($ENV{SRCTOP} && $ENV{BLDTOP});

    BAIL_OUT("setup() found both \$TOP and \$SRCTOP or \$BLDTOP...")
@@ -131,7 +137,7 @@ sub setup { 


    __env();



    BAIL_OUT("setup() expects the file Configure in the \$TOP directory")

    BAIL_OUT("setup() expects the file Configure in the source top directory")

        unless -f srctop_file("Configure");



    __cwd($directories{RESULTS});