summaryrefslogtreecommitdiff
path: root/util/perl
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-02-15 07:18:57 +0100
committerRichard Levitte <levitte@openssl.org>2020-02-18 09:45:53 +0100
commiteeacf7d065e817b2c0c29ce7d6a9d8047450a293 (patch)
treee816f9a8613b122f226afa0d88b78d912a2513fb /util/perl
parenta60079c76e9b8d9bd9e7da228ff514db8162459f (diff)
downloadopenssl-new-eeacf7d065e817b2c0c29ce7d6a9d8047450a293.tar.gz
TEST: Optionally silence OpenSSL::Test::setup()
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)
Diffstat (limited to 'util/perl')
-rw-r--r--util/perl/OpenSSL/Test.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index 75ba2d3a63..4297106392 100644
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -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});
}