From 79197dac5856a9628fd3526a7df19829cce96aff Mon Sep 17 00:00:00 2001 From: Charlie Turner Date: Wed, 11 Aug 2021 09:17:46 +0100 Subject: [PATCH] ci: Build libdrm earlier for x86_test-vk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VK-CTS v1.2.7.0 has buggy tests that only work if DRM support is available for them (drm_files_exist). This isn't exposed in the Mesa CI by other farms, because their infra installs libdrm-dev as part of either rootfs generation for freedreno/broadcom or respective container stages (for lava). In the case of radv, we directly use the x86 Mesa testing containers, so we are the odd ones out here. By moving the building of the custom libdrm above the building of vk-gl-cts, it will compile in support required for this test to pass, ensuring the x86_test-vk container has the right dependencies to match the rest of the CI. Lava actually installs drm development files twice, once from the Debian repos, which vk-gl-cts then compiles against, and a second time from a tarball, which the tests will use at runtime. Seemed a little cleaner to use the version of libdrm specified in the Mesa CI, and hence used at both build time and runtime. A bug should be raised with the testsuite to avoid this in the future, but we should probably have libdrm development files exposed for these components anyway. Reviewed-by: Michel Dänzer Reviewed-by: Martin Peres Part-of: --- .gitlab-ci/container/debian/x86_test-vk.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 6f0b049f1bc..b10d61162d6 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -120,6 +120,10 @@ wine \ . .gitlab-ci/container/container_pre_build.sh +############### Build libdrm + +. .gitlab-ci/container/build-libdrm.sh + ############### Build parallel-deqp-runner's hang-detection tool . .gitlab-ci/container/build-hang-detection.sh @@ -146,10 +150,6 @@ setup_wine "/vkd3d-proton-wine64" . .gitlab-ci/container/build-vkd3d-proton.sh -############### Build libdrm - -. .gitlab-ci/container/build-libdrm.sh - ############### Uninstall the build software ccache --show-stats