summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-07-29 13:58:18 +0100
committerMatt Caswell <matt@openssl.org>2020-07-30 10:13:22 +0100
commitadf3f83e5227206a011ca1bca3ef9f63709fb96e (patch)
treeeee871a8db1baa729117410a7e8c7753df20f658
parentb8ea8d3912006223891a621a7bff19225e93469d (diff)
Fix test_cmp_cli for extended tests
The test_cmp_cli was failing in the extended tests on cross-compiled mingw builds. This was due to the test not using wine when it should do. The simplest solution is to just skip the test in this case. [extended tests] Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12555)
-rw-r--r--test/recipes/81-test_cmp_cli.t2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/recipes/81-test_cmp_cli.t b/test/recipes/81-test_cmp_cli.t
index 009cdcc4d8..51b4baf6a5 100644
--- a/test/recipes/81-test_cmp_cli.t
+++ b/test/recipes/81-test_cmp_cli.t
@@ -34,6 +34,8 @@ plan skip_all => "These tests are not supported in a no-ec build"
plan skip_all => "Tests involving CMP server not available on Windows or VMS"
if $^O =~ /^(VMS|MSWin32)$/;
+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`;
plan skip_all => "Tests involving CMP server require 'lsof' command"