提交 346bf1a2 编写于 作者: R Richard Levitte

test/recipes/90-test_store.t: Test absolute files

We haven't tested plain absolute paths without making them URIs...
Reviewed-by: NAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3907)
上级 94437ceb
...@@ -56,10 +56,10 @@ my @generated_files = ...@@ -56,10 +56,10 @@ my @generated_files =
"ec-key-aes256-cbc-sha256.p12", "ec-key-aes256-cbc-sha256.p12",
); );
my $n = (2 * scalar @noexist_files) my $n = (3 * scalar @noexist_files)
+ (5 * scalar @src_files) + (6 * scalar @src_files)
+ (3 * scalar @generated_files) + (4 * scalar @generated_files)
+ 2; + 3;
plan tests => $n; plan tests => $n;
...@@ -71,11 +71,13 @@ indir "store_$$" => sub { ...@@ -71,11 +71,13 @@ indir "store_$$" => sub {
foreach (@noexist_files) { foreach (@noexist_files) {
my $file = srctop_file($_); my $file = srctop_file($_);
ok(!run(app(["openssl", "storeutl", $file]))); ok(!run(app(["openssl", "storeutl", $file])));
ok(!run(app(["openssl", "storeutl", to_abs_file($file)])));
ok(!run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); ok(!run(app(["openssl", "storeutl", to_abs_file_uri($file)])));
} }
foreach (@src_files) { foreach (@src_files) {
my $file = srctop_file($_); my $file = srctop_file($_);
ok(run(app(["openssl", "storeutl", $file]))); ok(run(app(["openssl", "storeutl", $file])));
ok(run(app(["openssl", "storeutl", to_abs_file($file)])));
ok(run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); ok(run(app(["openssl", "storeutl", to_abs_file_uri($file)])));
ok(run(app(["openssl", "storeutl", to_abs_file_uri($file, 0, ok(run(app(["openssl", "storeutl", to_abs_file_uri($file, 0,
"")]))); "")])));
...@@ -87,6 +89,8 @@ indir "store_$$" => sub { ...@@ -87,6 +89,8 @@ indir "store_$$" => sub {
foreach (@generated_files) { foreach (@generated_files) {
ok(run(app(["openssl", "storeutl", "-passin", "pass:password", ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
$_]))); $_])));
ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
to_abs_file($_)])));
ok(run(app(["openssl", "storeutl", "-passin", "pass:password", ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
to_abs_file_uri($_)]))); to_abs_file_uri($_)])));
ok(!run(app(["openssl", "storeutl", "-passin", "pass:password", ok(!run(app(["openssl", "storeutl", "-passin", "pass:password",
...@@ -95,6 +99,7 @@ indir "store_$$" => sub { ...@@ -95,6 +99,7 @@ indir "store_$$" => sub {
{ {
my $dir = srctop_dir("test", "certs"); my $dir = srctop_dir("test", "certs");
ok(run(app(["openssl", "storeutl", $dir]))); ok(run(app(["openssl", "storeutl", $dir])));
ok(run(app(["openssl", "storeutl", to_abs_file($dir, 1)])));
ok(run(app(["openssl", "storeutl", to_abs_file_uri($dir, 1)]))); ok(run(app(["openssl", "storeutl", to_abs_file_uri($dir, 1)])));
} }
} }
...@@ -341,6 +346,12 @@ sub to_file_uri { ...@@ -341,6 +346,12 @@ sub to_file_uri {
return "file:$file"; return "file:$file";
} }
sub to_abs_file {
my ($file) = @_;
return File::Spec->rel2abs($file);
}
sub to_abs_file_uri { sub to_abs_file_uri {
my ($file, $isdir, $authority) = @_; my ($file, $isdir, $authority) = @_;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册