Module: Mesa Branch: main Commit: 27a1b4e4f314832c164380ea332c096fe394c8f0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27a1b4e4f314832c164380ea332c096fe394c8f0
Author: Eric Engestrom <e...@igalia.com> Date: Wed Jan 10 21:50:45 2024 +0000 ci/deqp: ensure that in `default` builds, wayland + x11 + xcb are all built If someone were to remove the libraries that are needed for these, `default` would simply not enable these tests, and the only thing we could notice is that test jobs would suddenly take less time to run. Instead, let's have a check to make sure dEQP's cmake has detected everything and enabled these platforms. Reviewed-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27041> --- .gitlab-ci/container/build-deqp.sh | 8 ++++++++ .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 850642c77d9..2c27288ae87 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -101,6 +101,14 @@ cmake -S /VK-GL-CTS -B . -G Ninja \ -DDEQP_TARGET=${DEQP_TARGET:-default} \ -DCMAKE_BUILD_TYPE=Release \ $EXTRA_CMAKE_ARGS + +# Make sure `default` doesn't silently stop detecting one of the platforms we care about +if [ "${DEQP_TARGET}" = 'default' ]; then + grep -q DEQP_SUPPORT_WAYLAND=1 build.ninja + grep -q DEQP_SUPPORT_X11=1 build.ninja + grep -q DEQP_SUPPORT_XCB=1 build.ninja +fi + mold --run ninja if [ "${DEQP_TARGET}" = 'android' ]; then diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index fe55edf7213..addc7aff056 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -18,14 +18,14 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-04-default" - DEBIAN_X86_64_TEST_GL_TAG: "2024-01-04-default" - DEBIAN_X86_64_TEST_VK_TAG: "2024-01-04-default" + DEBIAN_X86_64_TEST_ANDROID_TAG: "2024-01-14-check-deqp" + DEBIAN_X86_64_TEST_GL_TAG: "2024-01-14-check-deqp" + DEBIAN_X86_64_TEST_VK_TAG: "2024-01-14-check-deqp" ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2024-01-06-libdrm" - KERNEL_ROOTFS_TAG: "2024-01-10-default" + KERNEL_ROOTFS_TAG: "2024-01-14-check-deqp" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "67f2c46b"
