From 1e8d5ea5df61daa46e8874d1f443e0e75211253b Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 30 May 2018 14:25:46 +0200 Subject: [PATCH] OSSL_STORE: don't test file: URIs on Mingw Under a mingw shell, the command line path conversion either mangles file: URIs to something useless (file;C:\...) or not at all (which can't be opened by the Windows C RTL unless we're really lucky), so we simply skip testing them in that environment. Fixes #6369 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/6376) --- test/recipes/90-test_store.t | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t index d453512667..888213e4a6 100644 --- a/test/recipes/90-test_store.t +++ b/test/recipes/90-test_store.t @@ -15,6 +15,8 @@ use OpenSSL::Test::Utils; my $test_name = "test_store"; setup($test_name); +my $mingw = config('target') =~ m|^mingw|; + my @noexist_files = ( "test/blahdiblah.pem", "test/blahdibleh.der" ); @@ -104,8 +106,9 @@ indir "store_$$" => sub { ok(run(app(["openssl", "storeutl", "-noout", $file]))); ok(run(app(["openssl", "storeutl", "-noout", to_abs_file($file)]))); + SKIP: { - local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; + skip "file: tests disabled on MingW", 4 if $mingw; ok(run(app(["openssl", "storeutl", "-noout", to_abs_file_uri($file)]))); @@ -123,8 +126,9 @@ indir "store_$$" => sub { ok(run(app(["openssl", "storeutl", "-noout", "-passin", "pass:password", to_abs_file($_)]))); + SKIP: { - local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; + skip "file: tests disabled on MingW", 2 if $mingw; ok(run(app(["openssl", "storeutl", "-noout", "-passin", "pass:password", to_abs_file_uri($_)]))); @@ -133,14 +137,20 @@ indir "store_$$" => sub { } } foreach (values %generated_file_files) { - local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; + SKIP: + { + skip "file: tests disabled on MingW", 1 if $mingw; - ok(run(app(["openssl", "storeutl", "-noout", $_]))); + ok(run(app(["openssl", "storeutl", "-noout", $_]))); + } } foreach (@noexist_file_files) { - local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; + SKIP: + { + skip "file: tests disabled on MingW", 1 if $mingw; - ok(!run(app(["openssl", "storeutl", "-noout", $_]))); + ok(!run(app(["openssl", "storeutl", "-noout", $_]))); + } } { my $dir = srctop_dir("test", "certs"); @@ -148,8 +158,9 @@ indir "store_$$" => sub { ok(run(app(["openssl", "storeutl", "-noout", $dir]))); ok(run(app(["openssl", "storeutl", "-noout", to_abs_file($dir, 1)]))); + SKIP: { - local $ENV{MSYS2_ARG_CONV_EXCL} = "file:"; + skip "file: tests disabled on MingW", 1 if $mingw; ok(run(app(["openssl", "storeutl", "-noout", to_abs_file_uri($dir, 1)]))); -- 2.25.1