mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-01 19:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: turn off parallel tests in verbose mode.

Browse Source 
The existing code prints a warning saying that verbose mode is ignored with
parallel jobs.  This seems backward, more useful is disabling parallel jobs
when verbose is enabled.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14137)
This commit is contained in:
Pauli 2021-02-09 18:32:32 +10:00
parent dfcfd17f28
commit 835f3526a2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/run_tests.pl
View File

@ -46,8 +46,14 @@ my %tapargs =
merge => 1,
);
$tapargs{jobs} = $jobs if $jobs > 1;
print "Using HARNESS_JOBS=$jobs\n" if $jobs > 1;
if ($jobs > 1) {
if ($ENV{HARNESS_VERBOSE}) {
print "Warning: HARNESS_JOBS > 1 ignored with HARNESS_VERBOSE\n";
} else {
$tapargs{jobs} = $jobs;
print "Using HARNESS_JOBS=$jobs\n";
}
}
# Additional OpenSSL special TAP arguments. Because we can't pass them via
# TAP::Harness->new(), they will be accessed directly, see the
@ -57,8 +63,6 @@ my %openssl_args = ();
$openssl_args{'failure_verbosity'} = $ENV{HARNESS_VERBOSE} ? 0 :
$ENV{HARNESS_VERBOSE_FAILURE_PROGRESS} ? 2 :
1; # $ENV{HARNESS_VERBOSE_FAILURE}
print "Warning: HARNESS_JOBS > 1 overrides HARNESS_VERBOSE\n"
if $jobs > 1 && $ENV{HARNESS_VERBOSE};
print "Warning: HARNESS_VERBOSE overrides HARNESS_VERBOSE_FAILURE*\n"
if ($ENV{HARNESS_VERBOSE} && ($ENV{HARNESS_VERBOSE_FAILURE}
|| $ENV{HARNESS_VERBOSE_FAILURE_PROGRESS}));