From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Jan 2024 14:28:06 +0000 (+0000)
Subject: QUIC QLOG: Don't build QLOG test if QLOG is disabled
X-Git-Tag: openssl-3.3.0-alpha1~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec0467a7a0699416c602a57213482a599ebbb64;p=thirdparty%2Fopenssl.git

QUIC QLOG: Don't build QLOG test if QLOG is disabled

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)
---

diff --git a/test/build.info b/test/build.info
index 2bdf5458925..10df828764b 100644
--- a/test/build.info
+++ b/test/build.info
@@ -79,7 +79,7 @@ IF[{- !$disabled{tests} -}]
   ENDIF
 
   IF[{- !$disabled{qlog} -}]
-    PROGRAMS{noinst}=json_test
+    PROGRAMS{noinst}=json_test quic_qlog_test
   ENDIF
 
   IF[{- !$disabled{comp} && (!$disabled{brotli} || !$disabled{zstd} || !$disabled{zlib}) -}]
@@ -374,9 +374,11 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[quic_multistream_test]=../include ../apps/include
   DEPEND[quic_multistream_test]=../libcrypto.a ../libssl.a libtestutil.a
 
-  SOURCE[quic_qlog_test]=quic_qlog_test.c
-  INCLUDE[quic_qlog_test]=../include ../apps/include
-  DEPEND[quic_qlog_test]=../libcrypto.a ../libssl.a libtestutil.a
+  IF[{- !$disabled{'qlog'} -}]
+      SOURCE[quic_qlog_test]=quic_qlog_test.c
+      INCLUDE[quic_qlog_test]=../include ../apps/include
+      DEPEND[quic_qlog_test]=../libcrypto.a ../libssl.a libtestutil.a
+  ENDIF
 
   SOURCE[asynctest]=asynctest.c
   INCLUDE[asynctest]=../include ../apps/include
@@ -1185,7 +1187,6 @@ ENDIF
     PROGRAMS{noinst}=quic_srtm_test quic_lcidm_test quic_rcidm_test
     PROGRAMS{noinst}=quic_fifd_test quic_txp_test quic_tserver_test
     PROGRAMS{noinst}=quic_client_test quic_cc_test quic_multistream_test
-    PROGRAMS{noinst}=quic_qlog_test
   ENDIF
 
   SOURCE[quic_ackm_test]=quic_ackm_test.c cc_dummy.c