CI: re-enable gcc asan builds
for some unclear reasons asan builds were limited to clang only. let us
enable them for gcc as well
(cherry picked from commit cfba1f93af4a6570b700bf4538b078e13bb65249)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 7a792bd30b87d35fde54e09869a956439dbc3ddd)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 83910f5b53b654151362ed7e9cb7e1697af83389)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/.github/matrix.py b/.github/matrix.py
index dd04299..264a3d2 100644
--- a/.github/matrix.py
+++ b/.github/matrix.py
@@ -55,16 +55,13 @@
def get_asan_flags(cc):
- if cc == "clang":
- return [
- "USE_OBSOLETE_LINKER=1",
- 'DEBUG_CFLAGS="-g -fsanitize=address"',
- 'LDFLAGS="-fsanitize=address"',
- 'CPU_CFLAGS.generic="-O1"',
- ]
+ return [
+ "USE_OBSOLETE_LINKER=1",
+ 'DEBUG_CFLAGS="-g -fsanitize=address"',
+ 'LDFLAGS="-fsanitize=address"',
+ 'CPU_CFLAGS.generic="-O1"',
+ ]
- raise ValueError("ASAN is only supported for clang")
-
matrix = []
@@ -159,37 +156,37 @@
# ASAN
os = "ubuntu-latest"
-CC = "clang"
TARGET = "linux-glibc"
-matrix.append(
- {
- "name": "{}, {}, ASAN, all features".format(clean_os(os), CC),
- "os": os,
- "TARGET": TARGET,
- "CC": CC,
- "FLAGS": get_asan_flags(CC)
- + [
- "USE_ZLIB=1",
- "USE_OT=1",
- "OT_INC=${HOME}/opt-ot/include",
- "OT_LIB=${HOME}/opt-ot/lib",
- "OT_RUNPATH=1",
- "USE_PCRE=1",
- "USE_PCRE_JIT=1",
- "USE_LUA=1",
- "USE_OPENSSL=1",
- "USE_SYSTEMD=1",
- "USE_WURFL=1",
- "WURFL_INC=addons/wurfl/dummy",
- "WURFL_LIB=addons/wurfl/dummy",
- "USE_DEVICEATLAS=1",
- "DEVICEATLAS_SRC=addons/deviceatlas/dummy",
- "USE_PROMEX=1",
- "USE_51DEGREES=1",
- "51DEGREES_SRC=addons/51degrees/dummy/pattern",
- ],
- }
-)
+for CC in ["gcc","clang"]:
+ matrix.append(
+ {
+ "name": "{}, {}, ASAN, all features".format(clean_os(os), CC),
+ "os": os,
+ "TARGET": TARGET,
+ "CC": CC,
+ "FLAGS": get_asan_flags(CC)
+ + [
+ "USE_ZLIB=1",
+ "USE_OT=1",
+ "OT_INC=${HOME}/opt-ot/include",
+ "OT_LIB=${HOME}/opt-ot/lib",
+ "OT_RUNPATH=1",
+ "USE_PCRE=1",
+ "USE_PCRE_JIT=1",
+ "USE_LUA=1",
+ "USE_OPENSSL=1",
+ "USE_SYSTEMD=1",
+ "USE_WURFL=1",
+ "WURFL_INC=addons/wurfl/dummy",
+ "WURFL_LIB=addons/wurfl/dummy",
+ "USE_DEVICEATLAS=1",
+ "DEVICEATLAS_SRC=addons/deviceatlas/dummy",
+ "USE_PROMEX=1",
+ "USE_51DEGREES=1",
+ "51DEGREES_SRC=addons/51degrees/dummy/pattern",
+ ],
+ }
+ )
# macOS