From: Michał Kępień <michal@isc.org>
Date: Thu, 26 Mar 2020 10:03:52 +0000 (+0100)
Subject: Define TSAN options in a global variable
X-Git-Tag: v9.14.12~9^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c8ce37e26223c1ec35844bfad28f0a999cbb206;p=thirdparty%2Fbind9.git

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.

(cherry picked from commit 6325c0993a4f73b7c79dea4835a98c894820f189)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ed62125b78..937ecb8163c 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: gzip
   TARBALL_EXTENSION: gz
@@ -915,7 +916,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
@@ -937,7 +938,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
@@ -970,7 +971,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
@@ -992,7 +993,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