The branch master has been updated via b83ace316282f05d8507561cc8129ec8491caade (commit) from 2db85ac97a5dda90249f5e630e7b29c4196fc397 (commit)
- Log ----------------------------------------------------------------- commit b83ace316282f05d8507561cc8129ec8491caade Author: Richard Levitte <levi...@openssl.org> Date: Fri May 5 23:08:55 2017 +0200 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: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3398) ----------------------------------------------------------------------- Summary of changes: test/recipes/95-test_external_boringssl.t | 1 - test/recipes/95-test_external_krb5.t | 14 ++++++-------- test/recipes/95-test_external_pyca.t | 20 ++++++++------------ 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/test/recipes/95-test_external_boringssl.t b/test/recipes/95-test_external_boringssl.t index 56505cf..5e3f67e 100644 --- a/test/recipes/95-test_external_boringssl.t +++ b/test/recipes/95-test_external_boringssl.t @@ -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}; diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t index 9981354..8cfec82 100644 --- a/test/recipes/95-test_external_krb5.t +++ b/test/recipes/95-test_external_krb5.t @@ -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"); diff --git a/test/recipes/95-test_external_pyca.t b/test/recipes/95-test_external_pyca.t index a64afd0..45d6c1b 100644 --- a/test/recipes/95-test_external_pyca.t +++ b/test/recipes/95-test_external_pyca.t @@ -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"); _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits