From: Richard Levitte <levitte@openssl.org>
Date: Tue, 7 Feb 2017 15:30:31 +0000 (+0100)
Subject: Test that storeutl with a directory path works as expected
X-Git-Tag: OpenSSL_1_1_1-pre1~1165
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d32e10d6fadd39bf01282922a8ed3543173de440

Test that storeutl with a directory path works as expected

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3542)
---

diff --git a/test/recipes/90-test_store.t b/test/recipes/90-test_store.t
index 53413b785b..0db70a40e7 100644
--- a/test/recipes/90-test_store.t
+++ b/test/recipes/90-test_store.t
@@ -8,7 +8,7 @@
 
 use File::Spec;
 use MIME::Base64;
-use OpenSSL::Test qw(:DEFAULT srctop_file bldtop_file data_file);
+use OpenSSL::Test qw(:DEFAULT srctop_file srctop_dir bldtop_file data_file);
 
 my $test_name = "test_store";
 setup($test_name);
@@ -59,7 +59,8 @@ my @generated_files =
 
 my $n = (2 * scalar @noexist_files)
     + (5 * scalar @src_files)
-    + (3 * scalar @generated_files);
+    + (3 * scalar @generated_files)
+    + 2;
 
 plan tests => $n;
 
@@ -92,6 +93,11 @@ indir "store_$$" => sub {
             ok(!run(app(["openssl", "storeutl", "-passin", "pass:password",
                          to_rel_file_uri($_)])));
         }
+        {
+            my $dir = srctop_dir("test", "certs");
+            ok(run(app(["openssl", "storeutl", $dir])));
+            ok(run(app(["openssl", "storeutl", to_file_uri($dir, 1)])));
+        }
     }
 }, create => 1, cleanup => 1;