From: Richard Levitte <levitte@openssl.org>
Date: Wed, 3 Feb 2016 23:24:16 +0000 (+0100)
Subject: Have 70-test_clienthello.t be selective on when it can be run
X-Git-Tag: OpenSSL_1_1_0-pre3~289
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c02bcb66782dd0378336aa7ec31e371b8353b90e;p=oweals%2Fopenssl.git

Have 70-test_clienthello.t be selective on when it can be run

The test program clienthello checks TLS extensions, so there's no
point running it when no TLS protocol is available.

Reviewed-by: Ben Laurie <ben@openssl.org>
---

diff --git a/test/recipes/70-test_clienthello.t b/test/recipes/70-test_clienthello.t
index 73b83f2e5f..2032d6d2f2 100644
--- a/test/recipes/70-test_clienthello.t
+++ b/test/recipes/70-test_clienthello.t
@@ -1,5 +1,13 @@
 #! /usr/bin/perl
 
-use OpenSSL::Test::Simple;
+use OpenSSL::Test;
+use OpenSSL::Test::Utils;
 
-simple_test("test_clienthello", "clienthellotest");
+setup("test_clienthello");
+
+plan skip_all => "No TLS/SSL protocols are supported by this OpenSSL build"
+    if alldisabled(grep { $_ ne "ssl3" } available_protocols("tls"));
+
+plan tests => 1;
+
+ok(run(test(["clienthellotest"])), "running clienthellotest");