diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 742f18ae9f5..77e4e96fbd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -277,7 +277,7 @@ x86_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &x86_build "2021-1-4-directx-headers" + MESA_IMAGE_TAG: &x86_build "2021-01-29-time" .use-x86_build: variables: 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 "$@"