diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-17 11:41:31 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-17 21:11:09 +0000 |
| commit | 1f8e4ec7d188ba4e6a572d52986bdba24ae15239 (patch) | |
| tree | e5621d5f59d679e6edac74843e75fd328d2c4bf6 /.gitlab-ci | |
| parent | ff6f11acdc611e1ce6fb568791624d11c529e88f (diff) | |
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9648>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/meson/build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |