diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a52513..93cff8b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,15 +35,15 @@ jobs: - name: Test extension with LLVM Sanitizer (MemorySanitizer) if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' run: | - docker compose run --entrypoint=/usr/local/bin/pskel --rm --env TEST_PHP_ARGS="--msan" --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=memory -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=memory -DZEND_TRACK_ARENA_ALLOC" shell test clang-msan-php + docker compose run --entrypoint=/usr/local/bin/pskel --rm --env TEST_PHP_ARGS="--msan" --env USE_ZEND_ALLOC=0 --env USE_TRACKED_ALLOC=1 --env ZEND_DONT_UNLOAD_MODULES=1 --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=memory -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=memory -DZEND_TRACK_ARENA_ALLOC" shell test clang-msan-php - name: Test extension with LLVM Sanitizer (AddressSanitizer) if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' run: | - docker compose run --entrypoint=/usr/local/bin/pskel --rm --env TEST_PHP_ARGS="--asan" --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=address -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=address -DZEND_TRACK_ARENA_ALLOC" shell test clang-asan-php + docker compose run --entrypoint=/usr/local/bin/pskel --rm --env TEST_PHP_ARGS="--asan" --env USE_ZEND_ALLOC=0 --env USE_TRACKED_ALLOC=1 --env ZEND_DONT_UNLOAD_MODULES=1 --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=address -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=address -DZEND_TRACK_ARENA_ALLOC" shell test clang-asan-php - name: Test extension with LLVM Sanitizer (UndefinedBehaviorSanitizer) if: matrix.platform == 'linux/amd64' && matrix.distro != 'alpine' run: | - docker compose run --entrypoint=/usr/local/bin/pskel --rm --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=undefined -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=undefined -DZEND_TRACK_ARENA_ALLOC" shell test clang-ubsan-php + docker compose run --entrypoint=/usr/local/bin/pskel --rm --env USE_ZEND_ALLOC=0 --env USE_TRACKED_ALLOC=1 --env ZEND_DONT_UNLOAD_MODULES=1 --env CC="/usr/bin/clang" --env CXX="/usr/bin/clang++" --env CFLAGS="-fsanitize=undefined -DZEND_TRACK_ARENA_ALLOC" --env CPPFLAGS="-fsanitize=undefined -DZEND_TRACK_ARENA_ALLOC" shell test clang-ubsan-php # Windows: # runs-on: windows-2022 # defaults: diff --git a/pskel.sh b/pskel.sh index 07795eb..1f1a3fa 100755 --- a/pskel.sh +++ b/pskel.sh @@ -43,10 +43,10 @@ EOF fi for BIN in "${1}" "${1}ize" "${1}-config"; do - if ! type "${1}" > /dev/null 2>&1; then - echo "Invalid argument: '${1}', executable file not found" >&2 - exit 1 - fi + if ! type "${1}" > /dev/null 2>&1; then + echo "Invalid argument: '${1}', executable file not found" >&2 + exit 1 + fi done PSKEL_EXT_DIR="/ext"