mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 13:11:13 +00:00
testsuite: Remove GLES 2 tests
We want to drop GLES 2 support.
This commit is contained in:
parent
8f3cd4733c
commit
58b44ebc1c
@ -68,7 +68,6 @@ style-check-diff:
|
|||||||
- "${CI_PROJECT_DIR}/_build/report-x11.xml"
|
- "${CI_PROJECT_DIR}/_build/report-x11.xml"
|
||||||
- "${CI_PROJECT_DIR}/_build/report-wayland.xml"
|
- "${CI_PROJECT_DIR}/_build/report-wayland.xml"
|
||||||
- "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
|
- "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
|
||||||
- "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
|
|
||||||
- "${CI_PROJECT_DIR}/_build/report-broadway.xml"
|
- "${CI_PROJECT_DIR}/_build/report-broadway.xml"
|
||||||
name: "gtk-${CI_COMMIT_REF_NAME}"
|
name: "gtk-${CI_COMMIT_REF_NAME}"
|
||||||
paths:
|
paths:
|
||||||
@ -135,8 +134,6 @@ release-build:
|
|||||||
- PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
|
- PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
|
||||||
- LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
|
- LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
|
||||||
- .gitlab-ci/run-tests.sh _build wayland gtk
|
- .gitlab-ci/run-tests.sh _build wayland gtk
|
||||||
# only repeat test runs that are likely affected by test setups
|
|
||||||
- .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
|
|
||||||
|
|
||||||
fedora-clang:
|
fedora-clang:
|
||||||
extends: .build-fedora-default
|
extends: .build-fedora-default
|
||||||
|
@ -221,14 +221,6 @@ renderers = [
|
|||||||
{ 'name': 'vulkan' },
|
{ 'name': 'vulkan' },
|
||||||
]
|
]
|
||||||
|
|
||||||
compare_xfails_small_texture = [
|
|
||||||
'big-checkerboard',
|
|
||||||
'big-checkerboard-scaled-down',
|
|
||||||
'big-checkerboard-scaled-down2',
|
|
||||||
'repeat-repeats', # only fails when rotated
|
|
||||||
'glyph-scaling',
|
|
||||||
]
|
|
||||||
|
|
||||||
variants = {
|
variants = {
|
||||||
'plain': '--plain',
|
'plain': '--plain',
|
||||||
'flip': '--flip',
|
'flip': '--flip',
|
||||||
@ -287,10 +279,6 @@ foreach renderer : renderers
|
|||||||
'gsk-compare-' + renderer_name,
|
'gsk-compare-' + renderer_name,
|
||||||
]
|
]
|
||||||
|
|
||||||
if compare_xfails_small_texture.contains(testname)
|
|
||||||
suites += 'wayland_gles2_failing'
|
|
||||||
endif
|
|
||||||
|
|
||||||
test_env = [
|
test_env = [
|
||||||
'GSK_RENDERER=' + renderer_name,
|
'GSK_RENDERER=' + renderer_name,
|
||||||
'GTK_A11Y=test',
|
'GTK_A11Y=test',
|
||||||
|
@ -23,12 +23,6 @@ exclude_unstable = ['flaky', 'failing']
|
|||||||
setups = [
|
setups = [
|
||||||
{ 'backend': 'x11', 'if': x11_enabled, },
|
{ 'backend': 'x11', 'if': x11_enabled, },
|
||||||
{ 'backend': 'wayland', 'if': wayland_enabled, 'is_default': true, },
|
{ 'backend': 'wayland', 'if': wayland_enabled, 'is_default': true, },
|
||||||
{ 'name': 'wayland_gles2',
|
|
||||||
'backend': 'wayland', 'if': wayland_enabled,
|
|
||||||
'env': ['GDK_DEBUG=default-settings',
|
|
||||||
'MESA_GLES_VERSION_OVERRIDE=2.0',
|
|
||||||
'GSK_MAX_TEXTURE_SIZE=1024',
|
|
||||||
], },
|
|
||||||
{ 'name': 'wayland_gl',
|
{ 'name': 'wayland_gl',
|
||||||
'backend': 'wayland', 'if': wayland_enabled,
|
'backend': 'wayland', 'if': wayland_enabled,
|
||||||
'env': ['GDK_DEBUG=gl-prefer-gl,default-settings',
|
'env': ['GDK_DEBUG=gl-prefer-gl,default-settings',
|
||||||
@ -48,11 +42,6 @@ foreach setup : setups
|
|||||||
exclude += 'gsk-compare-broadway'
|
exclude += 'gsk-compare-broadway'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if name == 'wayland_gles2'
|
|
||||||
# exclude tests that are failing with the small texture size in this setup
|
|
||||||
exclude += 'wayland_gles2_failing'
|
|
||||||
endif
|
|
||||||
|
|
||||||
env = common_env + [
|
env = common_env + [
|
||||||
'GDK_BACKEND=@0@'.format(backend),
|
'GDK_BACKEND=@0@'.format(backend),
|
||||||
] + setup.get('env', [])
|
] + setup.get('env', [])
|
||||||
|
Loading…
Reference in New Issue
Block a user