From ad2510836c8a5b03b4a63e276e370a64161cd6b8 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Fri, 27 Apr 2018 06:05:49 +0200
Subject: [PATCH] Skip the CMS test if configured 'no-cms'

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6108)
---
 test/cms-test.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/cms-test.pl b/test/cms-test.pl
index baa3b5948a..69436f1361 100644
--- 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)
 	{
-- 
2.25.1