Skip to content

Commit b0827ea

Browse files
committed
[sanitizers] Consolidate a shell variables initialization
1 parent b527df5 commit b0827ea

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,37 +277,35 @@ function build_stage2 {
277277
mkdir -p "${SANITIZER_LOG_DIR}"
278278

279279
local log_path="${SANITIZER_LOG_DIR}/report"
280+
local san_options="log_path=${log_path}:log_exe_name=1:abort_on_error=1"
280281

281282
if [ "$sanitizer_name" == "msan" ]; then
282283
export MSAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
283-
export MSAN_OPTIONS="abort_on_error=1"
284-
export MSAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
284+
export MSAN_OPTIONS="${san_options}"
285285
llvm_use_sanitizer="Memory"
286286
fsanitize_flag="-fsanitize=memory"
287287
elif [ "$sanitizer_name" == "msan_track_origins" ]; then
288288
export MSAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
289-
export MSAN_OPTIONS="abort_on_error=1"
290-
export MSAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
289+
export MSAN_OPTIONS="${san_options}"
291290
llvm_use_sanitizer="MemoryWithOrigins"
292291
fsanitize_flag="-fsanitize=memory -fsanitize-memory-track-origins"
293292
elif [ "$sanitizer_name" == "asan" ]; then
294293
export ASAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
295294
# TODO strict_init_order=true
296295
export ASAN_OPTIONS="check_initialization_order=true"
297-
export ASAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
296+
export ASAN_OPTIONS+=":${san_options}:abort_on_error=0"
298297
llvm_use_sanitizer="Address"
299298
fsanitize_flag="-fsanitize=address"
300299
elif [ "$sanitizer_name" == "hwasan" ]; then
301300
export HWASAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
302-
export HWASAN_OPTIONS="abort_on_error=1"
303-
export HWASAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
301+
export HWASAN_OPTIONS="${san_options}"
304302
llvm_use_sanitizer="HWAddress"
305303
fsanitize_flag="-fsanitize=hwaddress"
306304
# FIXME: Support globals with DSO https://github.com/llvm/llvm-project/issues/57206
307305
cmake_stage2_common_options+=" -DLLVM_ENABLE_PLUGINS=OFF"
308306
elif [ "$sanitizer_name" == "ubsan" ]; then
309307
export UBSAN_OPTIONS="external_symbolizer_path=${llvm_symbolizer_path}:print_stacktrace=1"
310-
export UBSAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
308+
export UBSAN_OPTIONS+=":${san_options}:abort_on_error=0"
311309
llvm_use_sanitizer="Undefined"
312310
fsanitize_flag="-fsanitize=undefined -fno-sanitize-recover=all"
313311
# FIXME: After switching to LLVM_ENABLE_RUNTIMES, vptr has infitine
@@ -317,7 +315,7 @@ function build_stage2 {
317315
# TODO strict_init_order=true
318316
export ASAN_SYMBOLIZER_PATH="${llvm_symbolizer_path}"
319317
export ASAN_OPTIONS="check_initialization_order=true"
320-
export ASAN_OPTIONS+=":log_path=${log_path}:log_exe_name=1"
318+
export ASAN_OPTIONS+=":${san_options}:abort_on_error=0"
321319
export UBSAN_OPTIONS="print_stacktrace=1"
322320
llvm_use_sanitizer="Address;Undefined"
323321
fsanitize_flag="-fsanitize=address,undefined -fno-sanitize-recover=all"

0 commit comments

Comments
 (0)