[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  18cb0221b9352adc6507adbcec301b49546cbc3e (commit)
      from  83ae8124de62f5f6d07dd4b0e6043c8a196b789e (commit)


- Log -----------------------------------------------------------------
commit 18cb0221b9352adc6507adbcec301b49546cbc3e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 21 11:07:14 2016 +0000

    Skip the CMS tests if CMS is disabled
    
    This fixes the no-cms compile time option.
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

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

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

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 21926d4..645f37a 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -11,6 +11,9 @@ use OpenSSL::Test::Utils;
 
 setup("test_cms");
 
+plan skip_all => "CMS is not supported by this OpenSSL build"
+    if disabled("cms");
+
 my $smdir    = srctop_dir("test", "smime-certs");
 my $smcont   = srctop_file("test", "smcont.txt");
 my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib)