QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 03:04:37 +00:00
Code Issues Projects Releases Wiki Activity

OSSL_STORE: don't test file: URIs on Mingw

Browse Source 
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 <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6376)
This commit is contained in:
Richard Levitte 2018-05-30 14:25:46 +02:00
parent 0124f32a01
commit 1e8d5ea5df
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/recipes/90-test_store.t
View File

@ -15,6 +15,8 @@ use OpenSSL::Test::Utils;
my $test_name = "test_store"; my $test_name = "test_store";
setup($test_name); setup($test_name);
my $mingw = config('target') =~ m|^mingw|;
my @noexist_files = my @noexist_files =
( "test/blahdiblah.pem", ( "test/blahdiblah.pem",
"test/blahdibleh.der" ); "test/blahdibleh.der" );
@ -104,8 +106,9 @@ indir "store_$$" => sub {
ok(run(app(["openssl", "storeutl", "-noout", $file]))); ok(run(app(["openssl", "storeutl", "-noout", $file])));
ok(run(app(["openssl", "storeutl", "-noout", to_abs_file($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", ok(run(app(["openssl", "storeutl", "-noout",
to_abs_file_uri($file)]))); to_abs_file_uri($file)])));
@ -123,8 +126,9 @@ indir "store_$$" => sub {
ok(run(app(["openssl", "storeutl", "-noout", "-passin", ok(run(app(["openssl", "storeutl", "-noout", "-passin",
"pass:password", to_abs_file($_)]))); "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", ok(run(app(["openssl", "storeutl", "-noout", "-passin",
"pass:password", to_abs_file_uri($_)]))); "pass:password", to_abs_file_uri($_)])));
@ -133,14 +137,20 @@ indir "store_$$" => sub {
} }
} }
foreach (values %generated_file_files) { 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) { 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"); 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", $dir])));
ok(run(app(["openssl", "storeutl", "-noout", ok(run(app(["openssl", "storeutl", "-noout",
to_abs_file($dir, 1)]))); 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", ok(run(app(["openssl", "storeutl", "-noout",
to_abs_file_uri($dir, 1)]))); to_abs_file_uri($dir, 1)])));