From a01b9cd5a76ea45e083dbf2ca002ca44ce3f525f Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Wed, 9 May 2018 12:05:39 +0100
Subject: [PATCH] Fix no-cms

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6205)
---
 test/build.info | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/build.info b/test/build.info
index 535c5aae80..c3a09048b5 100644
--- a/test/build.info
+++ b/test/build.info
@@ -51,7 +51,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
           recordlentest drbgtest drbg_cavs_test sslbuffertest \
           time_offset_test pemtest ssl_cert_table_internal_test ciphername_test \
           servername_test ocspapitest rsa_mp_test fatalerrtest tls13ccstest \
-          sysdefaulttest cmsapitest
+          sysdefaulttest
 
   SOURCE[versions]=versions.c
   INCLUDE[versions]=../include
@@ -373,9 +373,12 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN
   INCLUDE[servername_test]=../include
   DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a
 
-  SOURCE[cmsapitest]=cmsapitest.c
-  INCLUDE[cmsapitest]=../include
-  DEPEND[cmsapitest]=../libcrypto libtestutil.a
+  IF[{- !$disabled{cms} -}]
+    PROGRAMS_NO_INST=cmsapitest
+    SOURCE[cmsapitest]=cmsapitest.c
+    INCLUDE[cmsapitest]=../include
+    DEPEND[cmsapitest]=../libcrypto libtestutil.a
+  ENDIF
 
   IF[{- !$disabled{psk} -}]
     PROGRAMS_NO_INST=dtls_mtu_test
-- 
2.34.1