Rename ASAN_OPTIONS_COMMON to ASAN_OPTIONS

Renaming the variable removes some of the complexity.

(cherry picked from commit 1f4a56cb3e826dd61effae29d3fa3354879463cf)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c0b773ff0fe3e58c3a7b46902abd78ff82834df..b07666f8be3bd62086d73808f95e97a39c6b5098 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
   CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra 
 
   # 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
+  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-12/bin/llvm-symbolizer"
 
   TARBALL_COMPRESSOR: xz
@@ -942,8 +942,6 @@ gcc:asan:
   <<: *build_job
 
 system:gcc:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *fedora_34_amd64_image
   <<: *system_test_job
   needs:
@@ -951,8 +949,6 @@ system:gcc:asan:
       artifacts: true
 
 unit:gcc:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *fedora_34_amd64_image
   <<: *unit_test_job
   needs:
@@ -969,8 +965,6 @@ clang:asan:
   <<: *build_job
 
 system:clang:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *base_image
   <<: *system_test_job
   needs:
@@ -978,8 +972,6 @@ system:clang:asan:
       artifacts: true
 
 unit:clang:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *base_image
   <<: *unit_test_job
   needs: