diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-12-02 09:05:22 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-02-04 07:25:14 +0100 |
| commit | b91a13f429570512bfee290e8ec50096b0667e45 (patch) | |
| tree | 18ec79a5aa9d5168576f94c3f639cd2d0a27d14b | |
| parent | c87bcdbde40eece72e81d8bf2c9219ce271d56e6 (diff) | |
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)
| -rw-r--r-- | test/run_tests.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/run_tests.pl b/test/run_tests.pl index 8a9e156a54..2be4e607a0 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -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; |