Skip the CMS test if configured 'no-cms'

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6108)

diff --git a/test/cms-test.pl b/test/cms-test.pl
index baa3b5948a4428aeccae1e1b1322eed0029d618a..69436f1361521fe43392f9a1a605635830dd4223 100644 (file)
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -100,6 +100,13 @@ my $no_ec2m;
 my $no_ecdh;
 my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
 
+system ("$ossl_path no-cms > $null_path");
+if ($? == 0)
+       {
+       print STDERR "CMS disabled.  skipping...\n";
+       exit 0;
+       }
+
 system ("$ossl_path no-ec > $null_path");
 if ($? == 0)
        {