[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  74b31db68ac5f1fc8d85f8fbd53dc186d0016b0b (commit)
      from  8106cb8b6d706079cbcabd4631f05e4526a316e1 (commit)


- Log -----------------------------------------------------------------
commit 74b31db68ac5f1fc8d85f8fbd53dc186d0016b0b
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jan 11 17:20:39 2016 +0100

    Only run DANE tests when EC is supported
    
    Since danetest is to test DANE rather than specific algorithms, it's
    acceptable to require EC when testing it.
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/80-test_dane.t | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/recipes/80-test_dane.t b/test/recipes/80-test_dane.t
index 060bfcf..e0aa524 100644
--- a/test/recipes/80-test_dane.t
+++ b/test/recipes/80-test_dane.t
@@ -3,9 +3,13 @@
 use strict;
 use warnings;
 use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
+use OpenSSL::Test::Utils;
 
 setup("test_dane");
 
+plan skip_all => "test_dane uses ec which is not supported by this OpenSSL build"
+    if disabled("ec");
+
 plan tests => 1;                # The number of tests being performed
 
 ok(run(test(["danetest", "example.com",