Test that storeutl with a directory path works as expected
authorRichard Levitte <levitte@openssl.org>
Tue, 7 Feb 2017 15:30:31 +0000 (16:30 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 29 Jun 2017 09:55:32 +0000 (11:55 +0200)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3542)

test/recipes/90-test_store.t

index 53413b7..0db70a4 100644 (file)
@@ -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;