diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c99fada3c..a2809e0d70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,6 @@ style-check-diff: - "${CI_PROJECT_DIR}/_build/report-x11.xml" - "${CI_PROJECT_DIR}/_build/report-wayland.xml" - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml" - - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml" - "${CI_PROJECT_DIR}/_build/report-broadway.xml" name: "gtk-${CI_COMMIT_REF_NAME}" 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 - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello - .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: extends: .build-fedora-default diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 882dc8a11d..915117a425 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -221,14 +221,6 @@ renderers = [ { '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 = { 'plain': '--plain', 'flip': '--flip', @@ -287,10 +279,6 @@ foreach renderer : renderers 'gsk-compare-' + renderer_name, ] - if compare_xfails_small_texture.contains(testname) - suites += 'wayland_gles2_failing' - endif - test_env = [ 'GSK_RENDERER=' + renderer_name, 'GTK_A11Y=test', diff --git a/testsuite/meson.build b/testsuite/meson.build index 490a04eb4f..56810d2a23 100644 --- a/testsuite/meson.build +++ b/testsuite/meson.build @@ -23,12 +23,6 @@ exclude_unstable = ['flaky', 'failing'] setups = [ { 'backend': 'x11', 'if': x11_enabled, }, { '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', 'backend': 'wayland', 'if': wayland_enabled, 'env': ['GDK_DEBUG=gl-prefer-gl,default-settings', @@ -48,11 +42,6 @@ foreach setup : setups exclude += 'gsk-compare-broadway' 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 + [ 'GDK_BACKEND=@0@'.format(backend), ] + setup.get('env', [])