From 1115ac52ac12a449cfd240421bd04f4d4f7b1ea9 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 28 Aug 2025 11:10:34 +0200 Subject: [PATCH] test: allow skipping tests on Xephyr with GLES The GLES tests need an actual GPU (/dev/dri/* device), which is not available within github CI runners, so we need to skip those when running there. Signed-off-by: Enrico Weigelt, metux IT consult --- .github/workflows/build-xserver.yml | 2 +- meson_options.txt | 2 ++ test/meson.build | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml index 68041feb17..95863c5d8d 100644 --- a/.github/workflows/build-xserver.yml +++ b/.github/workflows/build-xserver.yml @@ -15,7 +15,7 @@ on: jobs: xserver-build-ubuntu: env: - MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=false -Dxcsecurity=true -Dxorg=true -Dxvfb=true -Dxnest=true + MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=false -Dxcsecurity=true -Dxorg=true -Dxvfb=true -Dxnest=true -Dtest_xephyr_gles=false LIBGL_ALWAYS_SOFTWARE: 1 GALLIUM_DRIVER: llvmpipe PIGLIT_PLATFORM: x11_egl diff --git a/meson_options.txt b/meson_options.txt index c29eda33c1..87c67ec005 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -152,3 +152,5 @@ option('legacy_nvidia_padding', type: 'boolean', value: false, # testsuite fine tuning - some things might not run everywhere option('test_rendercheck_triangles', type: 'boolean', value: false, description: 'testsuite: run rendercheck triangles tests (might fail on Xephyr)') +option('test_xephyr_gles', type: 'boolean', value: true, + description: 'testsuite: run gles2/gles3 tests on Xephyr (might fail w/o DRI)') diff --git a/test/meson.build b/test/meson.build index 8eac0f14b5..f97aa3ea21 100644 --- a/test/meson.build +++ b/test/meson.build @@ -112,7 +112,11 @@ if get_option('xvfb') endif if get_option('xephyr') and build_glamor - foreach testsuite : ['','-gles2','-gles3'] + glamor_tests = [''] + if get_option('test_xephyr_gles') + glamor_tests += ['-gles2','-gles3'] + endif + foreach testsuite : glamor_tests test_env = piglit_env if(testsuite == '-gles2') test_env = gles20_env