root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

run_tests.pl: Improve diagnostics on the use of HARNESS_JOBS 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13551)
This commit is contained in:
Dr. David von Oheimb 2020-12-02 09:05:22 +01:00 committed by Dr. David von Oheimb
parent c87bcdbde4
commit b91a13f429
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/run_tests.pl
View File

@ -47,6 +47,7 @@ my %tapargs =
);
$tapargs{jobs} = $jobs if $jobs > 1;
print "Using HARNESS_JOBS=$jobs\n" if $jobs > 1;
# Additional OpenSSL special TAP arguments. Because we can't pass them via
# TAP::Harness->new(), they will be accessed directly, see the
@ -57,7 +58,7 @@ $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;
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}));
@ -76,7 +77,7 @@ sub reorder {
my $key = pop;
# for parallel test runs, do slow tests first
if (defined $jobs && $jobs > 1 && $key =~ m/test_ssl_new|test_fuzz/) {
if ($jobs > 1 && $key =~ m/test_ssl_new|test_fuzz/) {
$key =~ s/(\d+)-/00-/;
}
return $key;