summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-05-01 16:00:24 -0400
committerMatthias Clasen <mclasen@redhat.com>2023-05-01 16:29:45 -0400
commita235b59089a7fe2d7957f20bcd2a67f9aef2f724 (patch)
tree7920d44a6564d720009fcfd0521a3e9bb6bc425a
parentb79d4a3a22441efe61d0cfc4467704e45f205d10 (diff)
downloadgtk+-a235b59089a7fe2d7957f20bcd2a67f9aef2f724.tar.gz
Skip some tests with small textures
When textures are too large, we will scale them down to fit the max texture size, which will cause comparisons to fail.
-rwxr-xr-x.gitlab-ci/run-tests.sh1
-rw-r--r--testsuite/gsk/meson.build13
-rw-r--r--testsuite/meson.build6
3 files changed, 17 insertions, 3 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 51e2db68fd..4a206ef2b0 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -50,6 +50,7 @@ case "${backend}" in
--suite=gtk \
--no-suite=failing \
--no-suite=flaky \
+ --no-suite=${backend}_failing \
--no-suite=gsk-compare-broadway
exit_code=$?
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 58d24d432c..7e738cd097 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -48,8 +48,7 @@ compare_render_tests = [
'empty-cross-fade',
'empty-debug',
'empty-inset-shadow',
-# this test fails for some of the backends
-# 'empty-linear-gradient',
+ 'empty-linear-gradient',
'empty-mask',
'empty-opacity',
'empty-outset-shadow',
@@ -108,10 +107,16 @@ renderers = [
compare_xfails = [
# Both tests fail because of some font rendering issue
+ 'empty-linear-gradient',
'unaligned-offscreen',
'upside-down-label-3d', # not really 3d, but cairo fails it
]
+compare_xfails_small_texture = [
+ 'big-checkerboard',
+ 'big-checkerboard-scaled-down'
+]
+
foreach renderer : renderers
foreach testname : compare_render_tests
@@ -129,6 +134,10 @@ foreach renderer : renderers
suites += 'failing'
endif
+ if compare_xfails_small_texture.contains(testname)
+ suites += 'wayland_smalltexture_failing'
+ endif
+
if ((exclude_term == '' or not testname.contains(exclude_term)) and
(renderer_name != 'broadway' or broadway_enabled))
test(renderer_name + ' ' + testname, compare_render,
diff --git a/testsuite/meson.build b/testsuite/meson.build
index 15c80a07f2..ebcf98d550 100644
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -25,7 +25,7 @@ setups = [
{ 'backend': 'broadway', 'if': broadway_enabled, },
{ 'name': 'wayland_smalltexture',
'backend': 'wayland', 'if': wayland_enabled,
- 'env': ['GSK_MAX_TEXTURE_SIZE=1024'], },
+ 'env': ['GSK_MAX_TEXTURE_SIZE=1024'] },
{ 'backend': 'win32', 'if': os_win32 },
]
@@ -39,6 +39,10 @@ foreach setup : setups
exclude += 'gsk-compare-broadway'
endif
+ if name == 'wayland_smalltexture'
+ exclude += 'wayland_smalltexture_failing'
+ endif
+
env = common_env + [
'GDK_BACKEND=@0@'.format(backend),
] + setup.get('env', [])