The branch master has been updated
via 884baafba4a5fec6502b828a73188d7133b9179b (commit)
from 4348995b0d818203f37ffa51c9bdf4488cf24bad (commit)
- Log -----------------------------------------------------------------
commit 884baafba4a5fec6502b828a73188d7133b9179b
Author: Jon Spillett <jon.spill...@oracle.com>
Date: Thu Sep 3 14:02:48 2020 +1000
Use return code for 'which command' checks
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12775)
-----------------------------------------------------------------------
Summary of changes:
test/recipes/81-test_cmp_cli.t | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index 8c4f0f920a..fa70c84981 100644
--- a/test/recipes/81-test_cmp_cli.t
+++ b/test/recipes/81-test_cmp_cli.t
@@ -37,9 +37,9 @@ plan skip_all => "Tests involving CMP server not available on
Windows or VMS"
plan skip_all => "Tests involving CMP server not available in cross-compile
builds"
if defined $ENV{EXE_SHELL};
plan skip_all => "Tests involving CMP server require 'kill' command"
- unless `which kill`;
+ if system("which kill");
plan skip_all => "Tests involving CMP server require 'lsof' command"
- unless `which lsof`; # this typically excludes Solaris
+ if system("which lsof"); # this typically excludes Solaris
sub chop_dblquot { # chop any leading & trailing '"' (needed for Windows)
my $str = shift;
