diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2020-09-01 05:13:09 +0200 |
|---|---|---|
| committer | Dmitry Belyavskiy <beldmit@gmail.com> | 2020-09-02 08:05:31 +0200 |
| commit | ef0f01c0afc84c85f07d739d77f04a29e7739cd6 (patch) | |
| tree | 30d8b0e7e2034004fcb309f76d1782906ebeb582 | |
| parent | Add -verbosity option to apps/cmp.c and add log output also in crypto/cmp (diff) | |
| download | openssl-ef0f01c0afc84c85f07d739d77f04a29e7739cd6.tar.xz openssl-ef0f01c0afc84c85f07d739d77f04a29e7739cd6.zip | |
Avoid uninitialised variable warning for jobs
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/12762)
| -rw-r--r-- | test/run_tests.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/run_tests.pl b/test/run_tests.pl index 2b05ddcbb0..14e195b468 100644 --- a/test/run_tests.pl +++ b/test/run_tests.pl @@ -31,7 +31,7 @@ my $srctop = $ENV{SRCTOP} || $ENV{TOP}; my $bldtop = $ENV{BLDTOP} || $ENV{TOP}; my $recipesdir = catdir($srctop, "test", "recipes"); my $libdir = rel2abs(catdir($srctop, "util", "perl")); -my $jobs = $ENV{HARNESS_JOBS}; +my $jobs = $ENV{HARNESS_JOBS} // 1; $ENV{OPENSSL_CONF} = rel2abs(catdir($srctop, "apps", "openssl.cnf")); $ENV{OPENSSL_CONF_INCLUDE} = rel2abs(catdir($bldtop, "providers")); @@ -46,7 +46,7 @@ my %tapargs = merge => 1, ); -$tapargs{jobs} = $jobs if defined $jobs; +$tapargs{jobs} = $jobs 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 +57,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 $ENV{HARNESS_JOBS} > 1; + if $jobs > 1; print "Warning: HARNESS_VERBOSE overrides HARNESS_VERBOSE_FAILURE*\n" if ($ENV{HARNESS_VERBOSE} && ($ENV{HARNESS_VERBOSE_FAILURE} || $ENV{HARNESS_VERBOSE_FAILURE_PROGRESS})); |