@@ -28,9 +28,9 @@ variables:
28
28
ASAN_SYMBOLIZER_PATH : " ${LLVM_SYMBOLIZER}"
29
29
30
30
TSAN_OPTIONS_COMMON : " disable_coredump=0 second_deadlock_stack=1 atexit_sleep_ms=1000 history_size=7 log_exe_name=true log_path=tsan"
31
- TSAN_SYMBOLIZER : " external_symbolizer_path=/usr/bin/llvm-symbolizer"
32
31
TSAN_SUPPRESSIONS : " suppressions=${CI_PROJECT_DIR}/.tsan-suppress"
33
- TSAN_OPTIONS_DEFAULT : " ${TSAN_OPTIONS_COMMON} ${TSAN_SUPPRESSIONS} ${TSAN_SYMBOLIZER}"
32
+ TSAN_OPTIONS_DEBIAN : " ${TSAN_OPTIONS_COMMON} ${TSAN_SUPPRESSIONS} external_symbolizer_path=${LLVM_SYMBOLIZER}"
33
+ TSAN_OPTIONS_FEDORA : " ${TSAN_OPTIONS_COMMON} ${TSAN_SUPPRESSIONS} external_symbolizer_path=/usr/bin/llvm-symbolizer"
34
34
35
35
UBSAN_OPTIONS : " halt_on_error=1:abort_on_error=1:disable_coredump=0"
36
36
@@ -158,6 +158,10 @@ stages:
158
158
image : " $CI_REGISTRY_IMAGE:debian-bullseye-amd64"
159
159
<< : *linux_amd64
160
160
161
+ .tsan-debian-bullseye-amd64 : &tsan_debian_bullseye_amd64_image
162
+ image : " $CI_REGISTRY_IMAGE:tsan-debian-bullseye-amd64"
163
+ << : *linux_amd64
164
+
161
165
.debian-bullseye-amd64cross32 : &debian_bullseye_amd64cross32_image
162
166
image : " $CI_REGISTRY_IMAGE:debian-bullseye-amd64cross32"
163
167
<< : *linux_amd64
@@ -174,6 +178,10 @@ stages:
174
178
175
179
# Fedora
176
180
181
+ .tsan-fedora-38-amd64 : &tsan_fedora_38_amd64_image
182
+ image : " $CI_REGISTRY_IMAGE:tsan-fedora-38-amd64"
183
+ << : *linux_amd64
184
+
177
185
.fedora-38-amd64 : &fedora_38_amd64_image
178
186
image : " $CI_REGISTRY_IMAGE:fedora-38-amd64"
179
187
<< : *linux_amd64
@@ -1090,29 +1098,29 @@ gcc:tsan:
1090
1098
CFLAGS : " ${CFLAGS_COMMON} -fsanitize=thread"
1091
1099
LDFLAGS : " -fsanitize=thread"
1092
1100
EXTRA_CONFIGURE : " --with-libidn2 --enable-pthread-rwlock --without-jemalloc"
1093
- << : *fedora_38_amd64_image
1101
+ << : *tsan_fedora_38_amd64_image
1094
1102
<< : *build_job
1095
1103
1096
1104
system:gcc:tsan :
1097
1105
variables :
1098
- TSAN_OPTIONS : " ${TSAN_OPTIONS_DEFAULT }"
1099
- << : *fedora_38_amd64_image
1106
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_FEDORA }"
1107
+ << : *tsan_fedora_38_amd64_image
1100
1108
<< : *system_test_tsan_job
1101
1109
needs :
1102
1110
- job : gcc:tsan
1103
1111
artifacts : true
1104
1112
1105
1113
unit:gcc:tsan :
1106
1114
variables :
1107
- TSAN_OPTIONS : " ${TSAN_OPTIONS_DEFAULT }"
1108
- << : *fedora_38_amd64_image
1115
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_FEDORA }"
1116
+ << : *tsan_fedora_38_amd64_image
1109
1117
<< : *unit_test_tsan_job
1110
1118
needs :
1111
1119
- job : gcc:tsan
1112
1120
artifacts : true
1113
1121
1114
1122
clang:tsan :
1115
- << : *base_image
1123
+ << : *tsan_debian_bullseye_amd64_image
1116
1124
<< : *build_job
1117
1125
variables :
1118
1126
CC : " ${CLANG}"
@@ -1122,8 +1130,8 @@ clang:tsan:
1122
1130
1123
1131
system:clang:tsan :
1124
1132
variables :
1125
- TSAN_OPTIONS : " ${TSAN_OPTIONS_COMMON} ${TSAN_SUPPRESSIONS} external_symbolizer_path=${LLVM_SYMBOLIZER }"
1126
- << : *base_image
1133
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_DEBIAN }"
1134
+ << : *tsan_debian_bullseye_amd64_image
1127
1135
<< : *system_test_tsan_job
1128
1136
needs :
1129
1137
- job : clang:tsan
@@ -1132,8 +1140,8 @@ system:clang:tsan:
1132
1140
1133
1141
unit:clang:tsan :
1134
1142
variables :
1135
- TSAN_OPTIONS : " ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/.tsan-suppress-extra external_symbolizer_path=${LLVM_SYMBOLIZER }"
1136
- << : *base_image
1143
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_DEBIAN }"
1144
+ << : *tsan_debian_bullseye_amd64_image
1137
1145
<< : *unit_test_tsan_job
1138
1146
needs :
1139
1147
- job : clang:tsan
@@ -1372,14 +1380,14 @@ respdiff-short:asan:
1372
1380
respdiff-short:tsan :
1373
1381
<< : *respdiff_job
1374
1382
<< : *default_triggering_rules
1375
- << : *debian_bullseye_amd64_image
1383
+ << : *tsan_debian_bullseye_amd64_image
1376
1384
variables :
1377
1385
CC : gcc
1378
1386
CFLAGS : " ${CFLAGS_COMMON} -Og -fsanitize=thread"
1379
1387
LDFLAGS : " -fsanitize=thread"
1380
1388
EXTRA_CONFIGURE : " --enable-pthread-rwlock --without-jemalloc"
1381
1389
MAX_DISAGREEMENTS_PERCENTAGE : " 0.5"
1382
- TSAN_OPTIONS : " ${TSAN_OPTIONS_DEFAULT }"
1390
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_DEBIAN }"
1383
1391
script :
1384
1392
- bash respdiff.sh -s named -q "${PWD}/10k_a.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
1385
1393
after_script :
@@ -1413,14 +1421,14 @@ respdiff-long:asan:
1413
1421
respdiff-long:tsan :
1414
1422
<< : *respdiff_job
1415
1423
<< : *api_schedules_tags_triggers_web_triggering_rules
1416
- << : *debian_bullseye_amd64_image
1424
+ << : *tsan_debian_bullseye_amd64_image
1417
1425
variables :
1418
1426
CC : gcc
1419
1427
CFLAGS : " ${CFLAGS_COMMON} -Og -fsanitize=thread"
1420
1428
LDFLAGS : " -fsanitize=thread"
1421
1429
EXTRA_CONFIGURE : " --enable-pthread-rwlock --without-jemalloc"
1422
1430
MAX_DISAGREEMENTS_PERCENTAGE : " 0.5"
1423
- TSAN_OPTIONS : " ${TSAN_OPTIONS_DEFAULT }"
1431
+ TSAN_OPTIONS : " ${TSAN_OPTIONS_DEBIAN }"
1424
1432
script :
1425
1433
- bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
1426
1434
after_script :
0 commit comments