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

diff --git a/test/recipes/95-test_external_boringssl.t b/test/recipes/95-test_external_boringssl.t
index 56505cf98b4184af4e9db02c3b3fc61d0f6a0ec9..5e3f67edbe7490574507d085770ce4540627ff14 100644 (file)
--- 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 => "No external tests in this configuration"
     if disabled("external-tests");

-

 plan skip_all => "BoringSSL runner not detected"
     if !$ENV{BORING_RUNNER_DIR};
 
 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 998135440b53cd091bbc980f2e9cd1f727182ad9..8cfec82239377be03ff016a9f453c014aa15815f 100644 (file)
--- 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");
 
 
 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 a64afd0a4038c2e9396b2d993dc4fdc375d467d5..45d6c1b47a840072f9ae120d5d365f0eb87f9640 100644 (file)
--- 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 => "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;
 
 
 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");