mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

TEST: Optionally silence OpenSSL::Test::setup()

Browse Source 
test/generate_ssl_tests.pl uses OpenSSL::Test to get to some of its
practical location functions.  A recent note in the setup() code made
its result not quite match the original (we do check that), so there's
a need to silence setup(), which we do with a simple optional argument.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11080)
This commit is contained in:
Richard Levitte 2020-02-15 07:18:57 +01:00
parent a60079c76e
commit eeacf7d065
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/generate_ssl_tests.pl
View File

@ -19,7 +19,7 @@ use OpenSSL::Test::Utils;
# This block needs to run before 'use lib srctop_dir' directives.
BEGIN {
OpenSSL::Test::setup("no_test_here");
OpenSSL::Test::setup("no_test_here", quiet => 1);
}
use FindBin;

4
util/perl/OpenSSL/Test.pm
View File

@ -132,6 +132,7 @@ is defined).
sub setup {
my $old_test_name = $test_name;
$test_name = shift;
my %opts = @_;
BAIL_OUT("setup() must receive a name") unless $test_name;
warn "setup() detected test name change. Innocuous, so we continue...\n"
@ -149,7 +150,8 @@ sub setup {
BAIL_OUT("setup() expects the file Configure in the source top directory")
unless -f srctop_file("Configure");
note "The results of this test will end up in $directories{RESULTS}";
note "The results of this test will end up in $directories{RESULTS}"
unless $opts{quiet};
__cwd($directories{RESULTS});
}