summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2020-12-12 16:12:59 +0000
committerSimon McVittie <smcv@debian.org>2020-12-12 17:32:31 +0000
commit9d4d7e53539d1e9222fb9d4466700af37147b8e1 (patch)
treeeeb9ae06ec251b993d5bc67f05fbd6d85a7679b9 /tests
parentbf13fc4c0d4ba9ced6015e825e58cde5370fe323 (diff)
downloadgdk-pixbuf-9d4d7e53539d1e9222fb9d4466700af37147b8e1.tar.gz
tests: Don't check whether bmp and gif loaders are enabledwip/run-gif-tests-again
This is conceptually similar to commit 2fd7d21f "tests: Fix GIF tests being permanently disabled". One way or another, gdk-pixbuf always supports these two formats: on Windows with the native gdiplus loader enabled, it covers these two formats; otherwise, format-specific loaders are used. This means we will run the GIF tests, as intended. Fixes: 7f0b214a "tests: Conditionally build and run tests" Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/meson.build5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/meson.build b/tests/meson.build
index 4368c6bae..ab7ff1eee 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,6 @@
# Resources contain PNG and BMP files, so we need these two loaders
# enabled in order to build them
-if enabled_loaders.contains('png') and enabled_loaders.contains('bmp')
+if enabled_loaders.contains('png')
# Resources; we cannot use gnome.compile_resources() here, because we need to
# override the environment in order to use the utilities we just built instead
# of the system ones
@@ -65,7 +65,6 @@ installed_tests = {
'pixbuf-construction': { 'suites': ['conform'], },
'animation': {
'suites': ['format'],
- 'skip': not enabled_loaders.contains('gif'),
},
'cve-2015-4491': {
'suites': ['security'],
@@ -107,11 +106,9 @@ installed_tests = {
'pixbuf-scale-two-step': { 'suites': ['ops'], },
'pixbuf-short-gif-write': {
'suites': ['format'],
- 'skip': not enabled_loaders.contains('gif'),
},
'pixbuf-gif-circular-table': {
'suites': ['format'],
- 'skip': not enabled_loaders.contains('gif'),
},
'pixbuf-save': { 'suites': ['io'] },
'pixbuf-readonly-to-mutable': { 'suites': ['conform'], },