Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
* upstream/topic/awelzel/3774-skip-script-args-test-under-tsan:
  btest: Skip core.script-args under TSAN
This commit is contained in:
Arne Welzel 2024-08-08 18:53:23 +02:00
commit 159f40a4bf
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/core/script-args.zeek
View file

@ -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

7
testing/scripts/have-tsan Executable file
View file

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