diff options
author | Richard Levitte <levitte@openssl.org> | 2017-03-21 11:26:28 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-03-21 16:12:29 +0100 |
commit | 30f1c9c4e08d479ab57fa6974dd99b077c745ffb (patch) | |
tree | a687868c7fa58bda4de4ae810d2cee01c06dffea /test/recipes | |
parent | 7e46e56acaa27933663a455cf819d841d4dbc436 (diff) |
Adapt 20-test_enc.t and 20-test_enc_more.t to use statusvar
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3004)
Diffstat (limited to 'test/recipes')
-rw-r--r-- | test/recipes/20-test_enc.t | 19 | ||||
-rw-r--r-- | test/recipes/20-test_enc_more.t | 15 |
2 files changed, 20 insertions, 14 deletions
diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t index 88a589041a..32a30165f1 100644 --- a/test/recipes/20-test_enc.t +++ b/test/recipes/20-test_enc.t @@ -27,20 +27,21 @@ my $test = catfile(".", "p"); my $cmd = "openssl"; +my $ciphersstatus = undef; my @ciphers = map { s/^\s+//; s/\s+$//; split /\s+/ } - run(app([$cmd, "list", "-cipher-commands"]), capture => 1); + run(app([$cmd, "list", "-cipher-commands"]), + capture => 1, statusvar => \$ciphersstatus); -plan tests => 1 + (scalar @ciphers)*2; - -my $init = ok(copy($testsrc,$test)); - -if (!$init) { - diag("Trying to copy $testsrc to $test : $!"); -} +plan tests => 2 + (scalar @ciphers)*2; SKIP: { - skip "Not initialized, skipping...", 11 unless $init; + skip "Problems getting ciphers...", 1 + scalar(@ciphers) + unless ok($ciphersstatus, "Running 'openssl list -cipher-commands'"); + unless (ok(copy($testsrc, $test), "Copying $testsrc to $test")) { + diag($!); + skip "Not initialized, skipping...", scalar(@ciphers); + } foreach my $c (@ciphers) { my %variant = ("$c" => [], diff --git a/test/recipes/20-test_enc_more.t b/test/recipes/20-test_enc_more.t index 1419ddb5c3..b4cef6941a 100644 --- a/test/recipes/20-test_enc_more.t +++ b/test/recipes/20-test_enc_more.t @@ -28,17 +28,22 @@ my $plaintext = catfile(".", "testdatafile"); my $fail = ""; my $cmd = "openssl"; +my $ciphersstatus = undef; my @ciphers = grep(! /wrap|^$|^[^-]/, (map { split /\s+/ } - run(app([$cmd, "enc", "-ciphers"]), capture => 1))); + run(app([$cmd, "enc", "-ciphers"]), + capture => 1, statusvar => \$ciphersstatus))); -plan tests => 1 + scalar @ciphers; - -my $init = ok(copy($testsrc, $plaintext)); +plan tests => 2 + scalar @ciphers; SKIP: { - skip "Not initialized, skipping...", (scalar @ciphers) unless $init; + skip "Problems getting ciphers...", 1 + scalar(@ciphers) + unless ok($ciphersstatus, "Running 'openssl enc -ciphers'"); + unless (ok(copy($testsrc, $plaintext), "Copying $testsrc to $plaintext")) { + diag($!); + skip "Not initialized, skipping...", scalar(@ciphers); + } foreach my $cipher (@ciphers) { my $ciphername = substr $cipher, 1; |