Skip to content

Commit de0f4a6

Browse files
committed
Try to fix CI config to enable ASAN and UBSAN
1 parent 0e13569 commit de0f4a6

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

.github/actions/configure-x64/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@ runs:
8181
${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
8282
${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
8383
--enable-werror \
84+
${{ inputs.asan == 'true' && '--enable-address-sanitizer' || '' }} \
85+
${{ inputs.asan == 'true' && '--enable-undefined-sanitizer' || '' }} \
8486
${{ inputs.configurationParameters }}

.github/workflows/test-suite.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ jobs:
3434
uses: ./.github/actions/configure-gentoo
3535
with:
3636
configurationParameters: >-
37-
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
38-
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
37+
CFLAGS="-fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
38+
LDFLAGS="-fno-sanitize=function"
3939
CC=clang-17
4040
CXX=clang++-17
4141
--enable-debug
42+
--enable-address-sanitizer
43+
--enable-undefined-sanitizer
4244
--enable-zts
4345
skipSlow: false # FIXME: This should likely include slow extensions
4446
- name: make
@@ -84,10 +86,12 @@ jobs:
8486
uses: ./.github/actions/configure-alpine
8587
with:
8688
configurationParameters: >-
87-
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
88-
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
89+
CFLAGS="-fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
90+
LDFLAGS="-fno-sanitize=function"
8991
--enable-debug
9092
--enable-zts
93+
--enable-address-sanitizer
94+
--enable-undefined-sanitizer
9195
skipSlow: true # FIXME: This should likely include slow extensions
9296
- name: make
9397
run: make -j$(/usr/bin/nproc) >/dev/null
@@ -165,7 +169,7 @@ jobs:
165169
uses: ./.github/actions/configure-x64
166170
with:
167171
configurationParameters: >-
168-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address"' || '' }}
172+
${{ matrix.asan && 'CFLAGS="-DZEND_TRACK_ARENA_ALLOC" LDFLAGS=""' || '' }}
169173
${{ matrix.variation && 'CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"' || '' }}
170174
${{ (matrix.variation && fromJson(inputs.branch).jobs.LINUX_X64.config.variation_enable_zend_max_execution_timers) && '--enable-zend-max-execution-timers' || '' }}
171175
--${{ matrix.debug && 'enable' || 'disable' }}-debug

0 commit comments

Comments
 (0)