mirror of
https://github.com/openssl/openssl.git
synced 2026-01-25 02:56:43 +00:00
test/run_tests.pl: Ensure that all HARNESS_VERBOSE values are respected
... with perl truthiness in mind Most of all, this means not having undue expectations that its value is numerical (this is particularly true when HARNESS_VERBOSE isn't given by the user, and this script's default is "yes"). We do this by ensuring that $tap_verbosity is turned into an appropriate number if HARNESS_VERBOSE's value isn't numerical. Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/29443)
This commit is contained in:
@@ -26,6 +26,7 @@ use File::Basename;
|
||||
use FindBin;
|
||||
use lib "$FindBin::Bin/../util/perl";
|
||||
use OpenSSL::Glob;
|
||||
use Scalar::Util qw(looks_like_number);
|
||||
|
||||
my $srctop = $ENV{SRCTOP} || $ENV{TOP};
|
||||
my $bldtop = $ENV{BLDTOP} || $ENV{TOP};
|
||||
@@ -78,7 +79,13 @@ $ENV{CTLOG_FILE} = rel2abs(catfile($srctop, "test", "ct", "log_list.cnf"));
|
||||
$ENV{'MALLOC_PERTURB_'} = '128' if !defined $ENV{'MALLOC_PERTURB_'};
|
||||
|
||||
my $tap_verbosity = exists $ENV{'HARNESS_VERBOSE'} ? $ENV{'HARNESS_VERBOSE'} : 0;
|
||||
# Show test times by default, unless we have lowered verbosity.
|
||||
# If $tap_verbosity looks like a number, keep its value. Otherwise, enforce a
|
||||
# numeric value for its truthiness.
|
||||
$tap_verbosity =
|
||||
looks_like_number($tap_verbosity)
|
||||
? $tap_verbosity
|
||||
: ($tap_verbosity ? 1 : 0);
|
||||
# Show test times by default, unless we have lowered verbosity (HARNESS_VERBOSE value < 0).
|
||||
my $tap_timer = ($tap_verbosity >= 0) ? 1 : 0;
|
||||
# But also ensure HARNESS_TIMER is respected if it is set.
|
||||
$tap_timer = exists $ENV{'HARNESS_TIMER'} ? $ENV{'HARNESS_TIMER'} : $tap_timer;
|
||||
|
||||
Reference in New Issue
Block a user