From f91624d38053d57276a321cd541f95f41d2fd0cc Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Sat, 11 Jul 2020 13:20:39 +0200 Subject: [PATCH] Skip test_cmp_cli if 'lsof' or 'kill' command is not available Fixes #12324 partly fixes #12378 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/12422) --- test/recipes/81-test_cmp_cli.t | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t index 32239ef35bd..fe837d63dc9 100644 --- a/test/recipes/81-test_cmp_cli.t +++ b/test/recipes/81-test_cmp_cli.t @@ -24,15 +24,20 @@ BEGIN { use lib srctop_dir('Configurations'); use lib bldtop_dir('.'); use platform; +plan skip_all => "These tests are not supported in a fuzz build" + if config('options') =~ /-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION/; plan skip_all => "These tests are not supported in a no-cmp build" if disabled("cmp"); plan skip_all => "These tests are not supported in a no-ec build" if disabled("ec"); -plan skip_all => "These tests are not supported in a fuzz build" - if config('options') =~ /-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION/; -plan skip_all => "Tests involving server not available on Windows or VMS" + +plan skip_all => "Tests involving CMP server not available on Windows or VMS" if $^O =~ /^(VMS|MSWin32)$/; +plan skip_all => "Tests involving CMP server require 'kill' command" + unless `which kill`; +plan skip_all => "Tests involving CMP server require 'lsof' command" + unless `which lsof`; # this typically excludes Solaris sub chop_dblquot { # chop any leading & trailing '"' (needed for Windows) my $str = shift; -- 2.47.2