From 6325c0993a4f73b7c79dea4835a98c894820f189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 26 Mar 2020 11:03:52 +0100 Subject: [PATCH] Define TSAN options in a global variable All assignments for the TSAN_OPTIONS variable are identical across the entire .gitlab-ci.yml file. Define a global TSAN_OPTIONS_COMMON variable and use it in job definitions to reduce code duplication. --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f68d3453bd..12e69e3aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ variables: # Pass run-time flags to AddressSanitizer to get core dumps on error. ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1 + TSAN_OPTIONS_COMMON: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER" TARBALL_COMPRESSOR: xz TARBALL_EXTENSION: xz @@ -913,7 +914,7 @@ gcc:tsan: system:gcc:tsan: variables: - TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER exitcode=0" + TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} before_script: - *setup_interfaces - echo $TSAN_OPTIONS @@ -935,7 +936,7 @@ system:gcc:tsan: unit:gcc:tsan: variables: - TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER" + TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} before_script: - echo $TSAN_OPTIONS - lib/isc/tests/result_test @@ -968,7 +969,7 @@ clang:tsan: system:clang:tsan: variables: - TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER exitcode=0" + TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} before_script: - *setup_interfaces - echo $TSAN_OPTIONS @@ -990,7 +991,7 @@ system:clang:tsan: unit:clang:tsan: variables: - TSAN_OPTIONS: "second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=$SYMBOLIZER" + TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} before_script: - echo $TSAN_OPTIONS - lib/isc/tests/result_test