Merge remote-tracking branch 'upstream/topic/awelzel/3774-skip-script-args-test-under-tsan'

* upstream/topic/awelzel/3774-skip-script-args-test-under-tsan:
  btest: Skip core.script-args under TSAN

(cherry picked from commit 159f40a4bf)

CHANGES

@@ -1,3 +1,13 @@
+7.0.3-23 | 2024-11-14 19:06:56 -0700
+
+  * btest: Skip core.script-args under TSAN (Arne Welzel, Corelight)
+
+    (cherry picked from commit 159f40a4bff10e7000cb5f5c8a08c6d2b236baef)
+
+  * Disable core.expr-execption btest under ZAM to fix CI builds (Tim Wojtulewicz, Corelight)
+
+  * Fix ubsan warning with ZAM and mmdb btest (Tim Wojtulewicz)
+
 7.0.3-19 | 2024-11-14 12:15:54 -0700
 
   * ci: Add asan and ubsan sanitizer tasks for ZAM (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-7.0.3-20
+7.0.3-23

testing/btest/core/script-args.zeek

@@ -2,6 +2,10 @@
 # the script differently, leading to complaints that there are no scripts.
 # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 
+# TSAN may re-execute the executable when the memory layout doesn't fullfill
+# requirements, causing argument confusion when that happens (see #3774).
+# @TEST-REQUIRES: ! have-tsan
+
 # @TEST-EXEC: printf '#!' > test.zeek
 # @TEST-EXEC: printf "$BUILD/src/zeek -b --\n" >> test.zeek
 # @TEST-EXEC: cat %INPUT >> test.zeek

testing/scripts/have-tsan

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if grep -q "ZEEK_SANITIZERS:STRING=.*thread.*" "${BUILD}"/CMakeCache.txt; then
+    exit 0
+fi
+
+exit 1