ci: Build libdrm earlier for x86_test-vk
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 <mdaenzer@redhat.com> Reviewed-by: Martin Peres <martin.peres@mupuf.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12777>
This commit is contained in:
parent
afee571d2b
commit
79197dac58
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue