Fix the no-tls option
authorMatt Caswell <matt@openssl.org>
Thu, 10 Nov 2016 11:27:07 +0000 (11:27 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 10 Nov 2016 13:04:11 +0000 (13:04 +0000)
Reviewed-by: Richard Levitte <levitte@openssl.org>
test/recipes/80-test_ssl_new.t
test/recipes/80-test_sslcorrupt.t

index 1e92907d56061f6b445bb9a7063473222a803217..d89aa3cf059af8ee1b050b9373f9042ad4a9f194 100644 (file)
@@ -72,7 +72,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,
   # 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,
 );
   "16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
   "18-dtls-renegotiate.conf" => $no_dtls,
 );
index ca5356d04b15cdaa224dbf22cbe4e13d15391103..53f8a822e28e0c968d9c59798d3959525480c9a9 100644 (file)
@@ -6,10 +6,14 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
 # 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");
 
 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"),
 plan tests => 1;
 
 ok(run(test(["sslcorrupttest", srctop_file("apps", "server.pem"),