From 1f8e4ec7d188ba4e6a572d52986bdba24ae15239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 17 Mar 2021 11:41:31 +0100 Subject: [PATCH] ci: Don't run meson tests in strace for meson-mingw32-x86_64 job There have been repeated timeouts: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3437#note_842273 Part-of: --- .gitlab-ci/meson/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index e47dc48be49..374be8306cf 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -42,8 +42,9 @@ fi # Only use GNU time if available, not any shell built-in command case $CI_JOB_NAME in + # strace and wine don't seem to mix well # ASAN leak detection is incompatible with strace - *-asan*) + meson-mingw32-x86_64|*-asan*) if test -f /usr/bin/time; then MESON_TEST_ARGS+=--wrapper=$PWD/.gitlab-ci/meson/time.sh fi