aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci/container/lava_arm.sh
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-05-28 12:50:51 -0700
committerMarge Bot <[email protected]>2020-06-09 18:28:18 +0000
commitdd167788ec1afaa3b960eda16a05621e842f40dd (patch)
treee46bd6f03e6fb47ffde86d2ce191b5a5d26a6b06 /.gitlab-ci/container/lava_arm.sh
parenteca02ec44aa977a86ab858c1c5ff3dd6ba91fae4 (diff)
ci: Build the full VK CTS for baremetal testing.
I'm going to enable the VK CTS on cheza, so swap the deqp we have in the container. build-deqp-vk already included GLES deqp binaries and data, and is a newer branch than the last opengl-es-cts tag. This brings a few things back over from build-deqp-gl for testlog extraction, and copyes out the GLES mustpass lists. Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5266>
Diffstat (limited to '.gitlab-ci/container/lava_arm.sh')
-rw-r--r--.gitlab-ci/container/lava_arm.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci/container/lava_arm.sh b/.gitlab-ci/container/lava_arm.sh
index ccebf1b823b..b5412804fbb 100644
--- a/.gitlab-ci/container/lava_arm.sh
+++ b/.gitlab-ci/container/lava_arm.sh
@@ -34,7 +34,12 @@ mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
############### Build dEQP
STRIP_CMD="${GCC_ARCH}-strip"
-. .gitlab-ci/build-deqp-gl.sh
+if [ -n "$INCLUDE_VK_CTS" ]; then
+ DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp-vk.sh
+else
+ . .gitlab-ci/build-deqp-gl.sh
+fi
+
mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.