[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1e8d5ea5df61daa46e8874d1f443e0e75211253b (commit)
      from  0124f32a01b2b4f4f7146f226b6a9dfe227c4008 (commit)


- Log -----------------------------------------------------------------
commit 1e8d5ea5df61daa46e8874d1f443e0e75211253b
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed May 30 14:25:46 2018 +0200

    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 <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6376)

-----------------------------------------------------------------------

Summary of changes:
 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 d453512..888213e 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)])));