From 1abd3a3051f753822c96ba408acb19d8a001804f Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Thu, 19 Jan 2023 17:37:14 +0100 Subject: [PATCH] ci/piglit: explicitely define we want GLX tests Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/debian/x86_test-gl.sh | 2 +- .gitlab-ci/container/debian/x86_test-vk.sh | 2 +- .gitlab-ci/container/lava_build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh index 1e52baea783..8ea3f3209ba 100644 --- a/.gitlab-ci/container/debian/x86_test-gl.sh +++ b/.gitlab-ci/container/debian/x86_test-gl.sh @@ -68,7 +68,7 @@ apt-get install -y --no-remove \ ############### Build piglit -PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh +PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON -DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh ############### Build dEQP GL diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 836368864a9..400d49b8c7f 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -107,7 +107,7 @@ wine64 \ ############### Build piglit -PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh +PIGLIT_BUILD_TARGETS="piglit_replayer" PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh ############### Build Fossilize diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 2a8192503dd..64f9d8d5fac 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -186,7 +186,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]] \ fi ############### Build piglit -PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitlab-ci/container/build-piglit.sh +PIGLIT_OPTS="-DPIGLIT_BUILD_DMA_BUF_TESTS=ON -DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/. ############### Build libva tests