summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-11-10 11:27:07 +0000
committerMatt Caswell <matt@openssl.org>2016-11-10 13:04:05 +0000
commit3ffb3406ce9d93756e15bf41fcfc86f9d582c452 (patch)
tree10b201ddc62f5075e2231ccb3efc15bc390f6903
parent6ca3e0f250b1b07557341b03141984f905761d19 (diff)
Fix the no-tls option
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--test/recipes/80-test_ssl_new.t2
-rw-r--r--test/recipes/80-test_sslcorrupt.t4
2 files changed, 5 insertions, 1 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 54e32bb878..7b8bc122ae 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -71,7 +71,7 @@ my %skip = (
# We should review this once we have TLS 1.3.
"13-fragmentation.conf" => disabled("tls1_2"),
"14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
- "15-certstatus.conf" => $no_ocsp,
+ "15-certstatus.conf" => $no_tls || $no_ocsp,
"16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
"18-dtls-renegotiate.conf" => $no_dtls,
);
diff --git a/test/recipes/80-test_sslcorrupt.t b/test/recipes/80-test_sslcorrupt.t
index ca5356d04b..53f8a822e2 100644
--- a/test/recipes/80-test_sslcorrupt.t
+++ b/test/recipes/80-test_sslcorrupt.t
@@ -6,10 +6,14 @@
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
+use OpenSSL::Test::Utils;
use OpenSSL::Test qw/:DEFAULT srctop_file/;
setup("test_sslcorrupt");
+plan skip_all => "No TLS protocols are supported by this OpenSSL build"
+ if alldisabled(available_protocols("tls"));
+
plan tests => 1;
ok(run(test(["sslcorrupttest", srctop_file("apps", "server.pem"),