Module: Mesa Branch: main Commit: 1915185648e606cf3c32cff1160305260577a5f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1915185648e606cf3c32cff1160305260577a5f0
Author: Michel Dänzer <[email protected]> Date: Wed Apr 12 11:24:13 2023 +0200 ci: Explicitly test for meson feature checks in compiler wrapper The previous indirect method was more complicated and still error prone. v2: * Use "grep -E" (Eric Engestrom) * Exclude spaces and slashes in the grep pattern, to avoid accidentally matching across unrelated compiler arguments. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22438> --- .gitlab-ci/build/compiler-wrapper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/build/compiler-wrapper.sh b/.gitlab-ci/build/compiler-wrapper.sh index 12a70fe6c30..f20b51859b9 100755 --- a/.gitlab-ci/build/compiler-wrapper.sh +++ b/.gitlab-ci/build/compiler-wrapper.sh @@ -6,8 +6,8 @@ else CCACHE= fi -if [ "$(ps -p $(ps -p $PPID -o ppid --no-headers) -o comm --no-headers)" != ninja ]; then - # Not invoked by ninja (e.g. for a meson feature check) +if echo "$@" | grep -E 'meson-private/tmp[^ /]*/testfile.c' >/dev/null; then + # Invoked for meson feature check exec $CCACHE $_COMPILER "$@" fi
