diff options
| author | Eric Engestrom <eric@igalia.com> | 2024-01-23 07:51:50 +0000 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-01-26 21:49:05 +0000 |
| commit | d9833b89a2af6ee0d46a9b1977ac41d94a5d29ad (patch) | |
| tree | 4a61e43f47ff43295632b8d0d1d63c7b6e72f7cb /.gitlab-ci | |
| parent | fb326ef27f317a9eaa298bb414f4be8808523852 (diff) | |
| download | mesa3d-d9833b89a2af6ee0d46a9b1977ac41d94a5d29ad.tar.gz | |
ci/deqp: drop the implicit DEQP_TARGET; explicitly set `default` in VK builds
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27250>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/build-deqp.sh | 4 | ||||
| -rw-r--r-- | .gitlab-ci/container/debian/x86_64_test-vk.sh | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/container/lava_build.sh | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index 66812ae1e2a..92c7bf92cc7 100644 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -130,12 +130,12 @@ if [ "${DEQP_TARGET}" != 'android' ]; then fi cmake -S /VK-GL-CTS -B . -G Ninja \ - -DDEQP_TARGET=${DEQP_TARGET:-default} \ + -DDEQP_TARGET=${DEQP_TARGET} \ -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}" = 'default' ]; then +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 diff --git a/.gitlab-ci/container/debian/x86_64_test-vk.sh b/.gitlab-ci/container/debian/x86_64_test-vk.sh index 806af571b43..b7d0a3e1a33 100644 --- a/.gitlab-ci/container/debian/x86_64_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_64_test-vk.sh @@ -104,6 +104,7 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh ############### Build dEQP VK DEQP_API=VK \ +DEQP_TARGET=default \ . .gitlab-ci/container/build-deqp.sh ############### Build apitrace diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 9002cee755d..14c17d5e113 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -277,6 +277,7 @@ DEQP_TARGET=surfaceless \ . .gitlab-ci/container/build-deqp.sh DEQP_API=VK \ +DEQP_TARGET=default \ . .gitlab-ci/container/build-deqp.sh mv /deqp $ROOTFS/. |