diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-01-29 11:03:19 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-02-01 11:55:56 +0000 |
| commit | 35f59e14f833944bff7df9ab99cf87bfb402c52f (patch) | |
| tree | 79ef57c91bbab824a01a9eee689030ef1ea0a34f /.gitlab-ci | |
| parent | cf23161040c650fc878427686d2452a1cae624f5 (diff) | |
ci: Use GNU time as meson test wrapper
This will hopefully give us more information about why some tests are
intermittently timing out.
Only in build jobs using the x86_build docker image for now, since
those are where we're currently seeing most such timeouts. But may
expand this later if it provides the expected benefits.
v2:
* Add comment about why we test for and use /usr/bin/time explicitly.
Acked-by: Eric Engestrom <eric@engestrom.ch> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8776>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/meson/test-wrapper.sh | 8 |
3 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index c9fb88d43a2..fe923e09d85 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -32,6 +32,7 @@ apt-get install -y --no-remove \ liblua5.3-dev \ libxml2-dev \ ocl-icd-opencl-dev \ + time \ wine-development \ wine32-development diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index 0330b77e609..34afdc8606a 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -59,6 +59,6 @@ meson _build --native-file=native.file \ cd _build meson configure ninja -LC_ALL=C.UTF-8 meson test --num-processes ${FDO_CI_CONCURRENT:-4} +LC_ALL=C.UTF-8 meson test --num-processes ${FDO_CI_CONCURRENT:-4} --wrapper=$PWD/../.gitlab-ci/meson/test-wrapper.sh ninja install cd .. diff --git a/.gitlab-ci/meson/test-wrapper.sh b/.gitlab-ci/meson/test-wrapper.sh new file mode 100755 index 00000000000..5e339c345ce --- /dev/null +++ b/.gitlab-ci/meson/test-wrapper.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Only use GNU time if available, not any shell built-in command +if test -f /usr/bin/time; then + exec /usr/bin/time -v "$@" +fi + +exec "$@" |