From bc5ae2e5cbfd783a46404c69d1fa8a3f9019f2f2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:12:06 +0100 Subject: [PATCH] ci/container: move piglit build section into the script itself Part-of: --- .gitlab-ci/container/build-piglit.sh | 4 ++++ .gitlab-ci/container/debian/test-gl.sh | 2 -- .gitlab-ci/container/debian/test-vk.sh | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 594b4b79516..11e884c0680 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -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 diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh index 0fee8756d5a..e13003c773f 100644 --- a/.gitlab-ci/container/debian/test-gl.sh +++ b/.gitlab-ci/container/debian/test-gl.sh @@ -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 diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index 9585e4c5ddd..bdbdb0d6db3 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -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