jjb: babeltrace: use --enable-asan (on some builds)

Use --enable-asan (which enables address sanitizer) when building
babeltrace > 2.0 with gcc.  On my machine, a clang build with
--enable-asan doesn't quite work, so avoid it for now.

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

diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml
index b5f9a359f018d4277bfbebb6374b84d17fd0a918..5339e0fe4cc5bf527f2bd24235e7c2f4928caa79 100644 (file)
--- a/jobs/babeltrace.yaml
+++ b/jobs/babeltrace.yaml
@@ -525,15 +525,15 @@
           buildtype: linuxbuild
           platforms: !!python/tuple [jammy-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, static, prod, min, doc]
-          filter: ''
+          confs: !!python/tuple [std, static, prod, min, doc, asan]
+          filter: '(build=="std") || (conf=="std") || (conf=="doc")'
           touchstone: '(build == "std") && (conf == "std")'
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: build
           platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
-          confs: !!python/tuple [std, static, prod, min, doc]
-          filter: ''
+          confs: !!python/tuple [std, static, prod, min, doc, asan]
+          filter: '(build=="std") || (conf=="std") || (conf=="doc")'
           touchstone: '(build == "std") && (conf == "std")'
       - '{job_prefix}babeltrace_{version}_{buildtype}':
           buildtype: portbuild

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index df29e93e60c38b36627331af542276d680e3a8af..1d03f72ab7b1811d26ad2fff7ace4d6e54f626cb 100755 (executable)
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -246,6 +246,14 @@ doc)
     CONF_OPTS+=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins" "--enable-api-doc")
     ;;
 
+asan)
+    echo "Address Sanitizer configuration"
+
+    # --enable-asan was introduced after 2.0 but don't check the version, we
+    # want this configuration to fail if ASAN is unavailable.
+    CONF_OPTS+=("--enable-asan" "--enable-python-bindings" "--enable-python-plugins")
+    ;;
+
 min)
     echo "Minimal configuration"
     ;;