generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-05 19:05:25 +01:00
parent db922318b3
commit fa657fc8df
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/testlib/OpenSSL/Test.pm
View File

@ -121,9 +121,15 @@ is defined).
=cut =cut
sub setup { sub setup {
my $old_test_name = $test_name;
$test_name = shift; $test_name = shift;
BAIL_OUT("setup() must receive a name") unless $test_name; 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") BAIL_OUT("setup() needs \$TOP or \$SRCTOP and \$BLDTOP to be defined")
unless $ENV{TOP} || ($ENV{SRCTOP} && $ENV{BLDTOP}); unless $ENV{TOP} || ($ENV{SRCTOP} && $ENV{BLDTOP});
BAIL_OUT("setup() found both \$TOP and \$SRCTOP or \$BLDTOP...") BAIL_OUT("setup() found both \$TOP and \$SRCTOP or \$BLDTOP...")
@ -131,8 +137,8 @@ sub setup {
__env(); __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"); unless -f srctop_file("Configure");
__cwd($directories{RESULTS}); __cwd($directories{RESULTS});
} }