[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a4750ce55e7d6451c187b5ab9ccf5218e0851eeb (commit)
      from  92e2ed5689671bbc003bfe752f660f769e86bf50 (commit)


- Log -----------------------------------------------------------------
commit a4750ce55e7d6451c187b5ab9ccf5218e0851eeb
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Apr 2 11:18:59 2017 +0200

    Disable 15-test_ecparam.t when configured no-ec2m
    
    This test doesn't actually fail completely, but there's no real
    pattern to distinguish which data files should be omitted when no-ec2m
    is configured and which should not.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3103)

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

Summary of changes:
 test/recipes/15-test_ecparam.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/15-test_ecparam.t b/test/recipes/15-test_ecparam.t
index ec629e9..9fabd3b 100644
--- a/test/recipes/15-test_ecparam.t
+++ b/test/recipes/15-test_ecparam.t
@@ -18,7 +18,7 @@ use OpenSSL::Test::Utils;
 setup("test_ecparam");
 
 plan skip_all => "EC isn't supported in this build"
-    if disabled("ec");
+    if disabled("ec") || disabled("ec2m");
 
 my @valid = glob(data_file("valid", "*.pem"));
 my @invalid = glob(data_file("invalid", "*.pem"));