Merge wayland_smalltexture and wayland_gles

We don't really need to have two full separate
test runs for these conditions, so combine them
into one test setup.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b152073e0bfc7128818d7801a97d8f1d5aabe7c8..657ddd4fca1e1a21dccf31c316ff515a3727e87c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,6 @@ style-check-diff:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_smalltexture.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -103,7 +102,6 @@ fedora-x86_64:
     - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
     - .gitlab-ci/run-tests.sh _build wayland_gles
-    - .gitlab-ci/run-tests.sh _build wayland_smalltexture
     - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 7e738cd09720d1dc02f83233dec403827f9d7ffa..709ad6f71c5c704ceb2a6a8653edcdf536516144 100644 (file)
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -135,7 +135,7 @@ foreach renderer : renderers
     endif
 
     if compare_xfails_small_texture.contains(testname)
-      suites += 'wayland_smalltexture_failing'
+      suites += 'wayland_gles_failing'
     endif
 
     if ((exclude_term == '' or not testname.contains(exclude_term)) and

diff --git a/testsuite/meson.build b/testsuite/meson.build
index 43d6cfcf1a83b047162345a604d6c8dd510d6e5c..b3008233390aaf438bdf0d4e36cf1b62f457cbf6 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -20,12 +20,10 @@ setups = [
     'env': ['GDK_DEBUG=gl-gles,default-settings',
             'MESA_GLES_VERSION_OVERRIDE=2.0',
             'MESA_EXTENSION_OVERRIDE=-GL_OES_vertex_array_object',
+            'GSK_MAX_TEXTURE_SIZE=1024',
            ], },
   { 'backend': 'win32', 'if': os_win32 },
   { 'backend': 'broadway', 'if': broadway_enabled, },
-  { 'name': 'wayland_smalltexture',
-    'backend': 'wayland', 'if': wayland_enabled,
-    'env': ['GSK_MAX_TEXTURE_SIZE=1024'] },
   { 'backend': 'win32', 'if': os_win32 },
 ]
 
@@ -39,8 +37,8 @@ foreach setup : setups
       exclude += 'gsk-compare-broadway'
     endif
 
-    if name == 'wayland_smalltexture'
-      exclude += 'wayland_smalltexture_failing'
+    if name == 'wayland_gles'
+      exclude += 'wayland_gles_failing'
     endif
 
     env = common_env + [