From ff42bf8b117880eccedf7c38f1b508fea2048322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 25 Jul 2025 13:09:53 -0400 Subject: [PATCH] radeonsi/ci: don't build GLES CTS separately GLES tests are available in GL CTS too. Delete the build_es directly manually. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/ci/build/conf_glcts.sh | 8 ++------ src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/radeonsi/ci/build/conf_glcts.sh b/src/gallium/drivers/radeonsi/ci/build/conf_glcts.sh index 77f6594fc87..3303a9c7a07 100755 --- a/src/gallium/drivers/radeonsi/ci/build/conf_glcts.sh +++ b/src/gallium/drivers/radeonsi/ci/build/conf_glcts.sh @@ -8,13 +8,9 @@ python3 external/fetch_sources.py rm -rf build mkdir build -cmake -B build . -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGLCTS_GTF_TARGET=gl -DDEQP_TARGET=x11_egl - -rm -rf build_es -mkdir build_es -cmake -B build_es . -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGLCTS_GTF_TARGET=gles32 -DDEQP_TARGET=x11_egl +cmake -B build . -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEQP_TARGET=x11_egl echo echo !!! GLCTS is not supposed to be installed !!! echo Type: -echo ' ninja -Cbuild && ninja -Cbuild_es' +echo ' ninja -Cbuild' diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py index 5bb436b3000..8cc10d1f968 100755 --- a/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py +++ b/src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py @@ -537,7 +537,7 @@ if args.escts: "--tests-per-group", "100", "--deqp", - "{}/build_es/external/openglcts/modules/glcts".format(glcts_path), + "{}/build/external/openglcts/modules/glcts".format(glcts_path), "--caselist", "{}/external/openglcts/data/gl_cts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles2-khr-main.txt".format( glcts_path