From: Michal Nowak <mnowak@isc.org>
Date: Wed, 15 Jun 2022 17:05:56 +0000 (+0200)
Subject: Fix external_symbolizer_path on Fedora
X-Git-Tag: v9.19.3~36^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e98b9c500903568c3ee23a66ee0d85d86f903499;p=thirdparty%2Fbind9.git

Fix external_symbolizer_path on Fedora

The external_symbolizer_path was wrong on Fedora since moving gcc:tsan
jobs from Debian to Fedora.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dae66ce2881..b2637808179 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
 
   # Pass run-time flags to AddressSanitizer to get core dumps on error.
   ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
-  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
+  TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan"
 
   TARBALL_EXTENSION: xz
 
@@ -986,7 +986,7 @@ gcc:tsan:
 system:gcc:tsan:
   variables:
     SOFTHSM2_MODULE: "/lib64/libsofthsm2.so"
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
   <<: *fedora_35_amd64_image
   <<: *system_test_tsan_job
   needs:
@@ -995,7 +995,7 @@ system:gcc:tsan:
 
 unit:gcc:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/bin/llvm-symbolizer"
   <<: *fedora_35_amd64_image
   <<: *unit_test_tsan_job
   needs:
@@ -1013,7 +1013,7 @@ clang:tsan:
 
 system:clang:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
   <<: *base_image
   <<: *system_test_tsan_job
   needs:
@@ -1022,7 +1022,7 @@ system:clang:tsan:
 
 unit:clang:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt"
   <<: *base_image
   <<: *unit_test_tsan_job
   needs: