Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion test/recipes/95-test_external_boringssl.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ setup("test_external_boringssl");

plan skip_all => "No external tests in this configuration"
if disabled("external-tests");

plan skip_all => "BoringSSL runner not detected"
if !$ENV{BORING_RUNNER_DIR};

Expand Down
14 changes: 6 additions & 8 deletions test/recipes/95-test_external_krb5.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ use OpenSSL::Test qw/:DEFAULT data_file srctop_file/;

setup("test_external_krb5");

plan tests => 1;
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");

SKIP: {
skip "No external tests in this configuration", 1
if disabled("external-tests");
skip "krb5 not available", 1
if ! -f srctop_file("krb5", "README");
plan tests => 1;

ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");
}
ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");
20 changes: 8 additions & 12 deletions test/recipes/95-test_external_pyca.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,14 @@ setup("test_external");

plan skip_all => "No external tests in this configuration"
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;

SKIP: {
skip "PYCA Cryptography not available", 1
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");
}

ok(run(cmd(["sh", data_file("cryptography.sh")])),
"running Python Cryptography tests");