XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: allow skipping tests on Xephyr with GLES

Browse Source 
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 <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-28 11:10:34 +02:00
parent dad67772fb
commit 1115ac52ac
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-xserver.yml vendored
View File

@@ -15,7 +15,7 @@ on:
jobs: jobs:
xserver-build-ubuntu: xserver-build-ubuntu:
env: 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 LIBGL_ALWAYS_SOFTWARE: 1
GALLIUM_DRIVER: llvmpipe GALLIUM_DRIVER: llvmpipe
PIGLIT_PLATFORM: x11_egl PIGLIT_PLATFORM: x11_egl

2
meson_options.txt
View File

@@ -152,3 +152,5 @@ option('legacy_nvidia_padding', type: 'boolean', value: false,
# testsuite fine tuning - some things might not run everywhere # testsuite fine tuning - some things might not run everywhere
option('test_rendercheck_triangles', type: 'boolean', value: false, option('test_rendercheck_triangles', type: 'boolean', value: false,
description: 'testsuite: run rendercheck triangles tests (might fail on Xephyr)') 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)')

6
test/meson.build
View File

@@ -112,7 +112,11 @@ if get_option('xvfb')
endif endif
if get_option('xephyr') and build_glamor 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 test_env = piglit_env
if(testsuite == '-gles2') if(testsuite == '-gles2')
test_env = gles20_env test_env = gles20_env