ci/container: move piglit build section into the script itself

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
This commit is contained in:
Eric Engestrom 2024-11-19 21:12:06 +01:00 committed by Marge Bot
parent 999cc1a86f
commit bc5ae2e5cb
3 changed files with 4 additions and 4 deletions

View file

@ -2,6 +2,8 @@
# shellcheck disable=SC2086 # we want word splitting
set -uex
uncollapsed_section_start piglit "Building piglit"
# When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags:
# DEBIAN_TEST_GL_TAG
@ -32,3 +34,5 @@ if [ "${PIGLIT_BUILD_TARGETS:-}" = "piglit_replayer" ]; then
-exec rm -rf {} \; 2>/dev/null
fi
popd
section_end piglit

View file

@ -84,8 +84,6 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \
############### Build piglit
uncollapsed_section_switch piglit "Building Piglit"
PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-DPIGLIT_USE_GBM=ON
-DPIGLIT_USE_WAYLAND=ON

View file

@ -82,8 +82,6 @@ apt-get install -y --no-remove --no-install-recommends \
############### Build piglit replayer
uncollapsed_section_switch piglit "Building Piglit for Vulkan (traces only)"
# We don't run any _piglit_ Vulkan tests in the containers.
PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
-DPIGLIT_USE_GBM=OFF