Commit b83ace31 authored by Richard Levitte's avatar Richard Levitte
Browse files

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



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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3398)
parent 2db85ac9

test/recipes/95-test_external_boringssl.t

+0 −1
Original line number Diff line number Diff line
@@ -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};

test/recipes/95-test_external_krb5.t

+6 −8
Original line number Diff line number Diff line
@@ -13,13 +13,11 @@ use OpenSSL::Test qw/:DEFAULT data_file srctop_file/; 


setup("test_external_krb5");



plan tests => 1;



SKIP: {

    skip "No external tests in this configuration", 1

plan skip_all "No external tests in this configuration"

    if disabled("external-tests");

    skip "krb5 not available", 1

plan skip_all "krb5 not available"

    if ! -f srctop_file("krb5", "README");



plan tests => 1;



ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests");
 
}

test/recipes/95-test_external_pyca.t

+8 −12
Original line number Diff line number Diff line
@@ -15,18 +15,14 @@ setup("test_external"); 


plan skip_all => "No external tests in this configuration"

    if disabled("external-tests");



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

plan skip_all "PYCA tests not available on Windows or VMS"

    if $^O =~ /^(VMS|MSWin32)$/;

    skip "PYCA tests only available in a shared build", 1

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;



ok(run(cmd(["sh", data_file("cryptography.sh")])),

   "running Python Cryptography tests");
 
}