[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  68a55f3b451060c747986aeffa322d32c770dd62 (commit)
      from  18b3a80a5fd368f59c322fbb16b7dc92c1f11efa (commit)


- Log -----------------------------------------------------------------
commit 68a55f3b451060c747986aeffa322d32c770dd62
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 6 17:49:41 2017 +0100

    Because our test sid file contains EC, don't try it when configured no-ec
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2564)

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

Summary of changes:
 test/recipes/25-test_sid.t | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/recipes/25-test_sid.t b/test/recipes/25-test_sid.t
index b13cb5c..a34f4b0 100644
--- a/test/recipes/25-test_sid.t
+++ b/test/recipes/25-test_sid.t
@@ -15,6 +15,9 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_sid");
 
+plan skip_all => 'test_sid needs EC to run'
+    if disabled('ec');
+
 plan tests => 2;
 
 require_ok(srctop_file('test','recipes','tconversion.pl'));