OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/deqp: drop the implicit DEQP_TARGET; explicitly set default in VK builds

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27250>
This commit is contained in:
Eric Engestrom
2024-01-23 07:51:50 +00:00
committed by Marge Bot
parent fb326ef27f
commit d9833b89a2
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-deqp.sh
View File

@@ -130,12 +130,12 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
fi fi
cmake -S /VK-GL-CTS -B . -G Ninja \ cmake -S /VK-GL-CTS -B . -G Ninja \
-DDEQP_TARGET=${DEQP_TARGET:-default} \ -DDEQP_TARGET=${DEQP_TARGET} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
$EXTRA_CMAKE_ARGS $EXTRA_CMAKE_ARGS
# Make sure `default` doesn't silently stop detecting one of the platforms we care about # 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_WAYLAND=1 build.ninja
grep -q DEQP_SUPPORT_X11=1 build.ninja grep -q DEQP_SUPPORT_X11=1 build.ninja
grep -q DEQP_SUPPORT_XCB=1 build.ninja grep -q DEQP_SUPPORT_XCB=1 build.ninja

1
.gitlab-ci/container/debian/x86_64_test-vk.sh
View File

@@ -104,6 +104,7 @@ PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
############### Build dEQP VK ############### Build dEQP VK
DEQP_API=VK \ DEQP_API=VK \
DEQP_TARGET=default \
. .gitlab-ci/container/build-deqp.sh . .gitlab-ci/container/build-deqp.sh
############### Build apitrace ############### Build apitrace

1
.gitlab-ci/container/lava_build.sh
View File

@@ -277,6 +277,7 @@ DEQP_TARGET=surfaceless \
. .gitlab-ci/container/build-deqp.sh . .gitlab-ci/container/build-deqp.sh
DEQP_API=VK \ DEQP_API=VK \
DEQP_TARGET=default \
. .gitlab-ci/container/build-deqp.sh . .gitlab-ci/container/build-deqp.sh
mv /deqp $ROOTFS/. mv /deqp $ROOTFS/.