mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange test/recipes/95-test_*.t to use skip_all

Browse Source 
The conditions to skip these recipes entirely don't show in a
non-verbose test harness output.  We prefer to know, so use skip_all,
as it is a little bit more verbose.

[extended tests]

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3398)
This commit is contained in:
Richard Levitte 2017-05-05 23:08:55 +02:00
parent 2db85ac97a
commit b83ace3162
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/recipes/95-test_external_boringssl.t
View File

@ -15,7 +15,6 @@ setup("test_external_boringssl");
plan skip_all => "No external tests in this configuration" plan skip_all => "No external tests in this configuration"
if disabled("external-tests"); if disabled("external-tests");
plan skip_all => "BoringSSL runner not detected" plan skip_all => "BoringSSL runner not detected"
if !$ENV{BORING_RUNNER_DIR}; if !$ENV{BORING_RUNNER_DIR};

14
test/recipes/95-test_external_krb5.t
View File

@ -13,13 +13,11 @@ use OpenSSL::Test qw/:DEFAULT data_file srctop_file/;
setup("test_external_krb5"); setup("test_external_krb5");
plan skip_all "No external tests in this configuration"
if disabled("external-tests");
plan skip_all "krb5 not available"
if ! -f srctop_file("krb5", "README");
plan tests => 1; plan tests => 1;
SKIP: { ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");
skip "No external tests in this configuration", 1
if disabled("external-tests");
skip "krb5 not available", 1
if ! -f srctop_file("krb5", "README");
ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");
}

20
test/recipes/95-test_external_pyca.t
View File

@ -15,18 +15,14 @@ setup("test_external");
plan skip_all => "No external tests in this configuration" plan skip_all => "No external tests in this configuration"
if disabled("external-tests"); if disabled("external-tests");
plan skip_all "PYCA tests not available on Windows or VMS"
if $^O =~ /^(VMS|MSWin32)$/;
plan skip_all "PYCA Cryptography not available"
if ! -f srctop_file("pyca-cryptography", "setup.py");
plan skip_all "PYCA tests only available in a shared build"
if disabled("shared");
plan tests => 1; plan tests => 1;
SKIP: { ok(run(cmd(["sh", data_file("cryptography.sh")])),
skip "PYCA Cryptography not available", 1 "running Python Cryptography tests");
if ! -f srctop_file("pyca-cryptography", "setup.py");
skip "PYCA tests not available on Windows or VMS", 1
if $^O =~ /^(VMS|MSWin32)$/;
skip "PYCA tests only available in a shared build", 1
if disabled("shared");
ok(run(cmd(["sh", data_file("cryptography.sh")])),
"running Python Cryptography tests");
}