From: Michael Jeanson <mjeanson@efficios.com>
Date: Fri, 18 Feb 2022 19:55:54 +0000 (-0500)
Subject: jjb: lttng-tools: Add log4j2 to agents config
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d51c467aa776f8cb13866b212787301954b9fe7d;p=lttng-ci.git

jjb: lttng-tools: Add log4j2 to agents config

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I1543b06461867db50dd07cf8b5d77e994781dce1
---

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 26048ff..a41fbfb 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -349,6 +349,11 @@ agents)
     export PYTHONPATH="$DEPS_PYTHON2:$DEPS_PYTHON3"
 
     CONF_OPTS+=("--enable-test-java-agent-all" "--enable-test-python-agent-all")
+
+    # Explicitly add '--enable-test-java-agent-log4j2', it's not part of '-all' in stable 2.12/2.13
+    if verlt "$PACKAGE_VERSION" "2.14"; then
+        CONF_OPTS+=("--enable-test-java-agent-log4j2")
+    fi
     ;;
 
 relayd-only)