ci/container: move deqp build section into the script itself
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
This commit is contained in:
committed by
Marge Bot
parent
2bd7592b0b
commit
6551fb6504
@@ -10,6 +10,11 @@
|
||||
|
||||
set -uex -o pipefail
|
||||
|
||||
# shellcheck disable=SC2153
|
||||
deqp_api=${DEQP_API,,}
|
||||
|
||||
uncollapsed_section_start deqp-$deqp_api "Building dEQP $DEQP_API"
|
||||
|
||||
# See `deqp_build_targets` below for which release is used to produce which
|
||||
# binary. Unless this comment has bitrotten:
|
||||
# - the VK release produces `deqp-vk`,
|
||||
@@ -97,9 +102,6 @@ pushd /VK-GL-CTS
|
||||
|
||||
mkdir -p /deqp
|
||||
|
||||
# shellcheck disable=SC2153
|
||||
deqp_api=${DEQP_API,,}
|
||||
|
||||
cts_commits_to_backport="${deqp_api}_cts_commits_to_backport[@]"
|
||||
for commit in "${!cts_commits_to_backport}"
|
||||
do
|
||||
@@ -259,3 +261,5 @@ fi
|
||||
du -sh ./*
|
||||
rm -rf /VK-GL-CTS
|
||||
popd
|
||||
|
||||
section_end deqp-$deqp_api
|
||||
|
||||
@@ -104,14 +104,10 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
|
||||
|
||||
############### Build dEQP GL
|
||||
|
||||
uncollapsed_section_switch piglit_gl "Building dEQP for GL"
|
||||
|
||||
DEQP_API=GL \
|
||||
DEQP_TARGET=surfaceless \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
uncollapsed_section_switch piglit_gles "Building dEQP for GLES"
|
||||
|
||||
DEQP_API=GLES \
|
||||
DEQP_TARGET=surfaceless \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
@@ -104,8 +104,6 @@ PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
|
||||
|
||||
############### Build dEQP VK
|
||||
|
||||
uncollapsed_section_switch deqp "Building Vulkan CTS (dEQP)"
|
||||
|
||||
DEQP_API=VK \
|
||||
DEQP_TARGET=default \
|
||||
. .gitlab-ci/container/build-deqp.sh
|
||||
|
||||
Reference in New Issue
Block a user