summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-01-29 12:21:29 -0500
committerXavier Claessens <xavier.claessens@collabora.com>2021-01-29 12:21:29 -0500
commitf359d6150a5a63cb10dd7f64fa6e33229a1183be (patch)
tree42c0d409a6f05e57274389640b1f5a669da26216
parent34a873e31d2b2ee5c5a00b93bb745ce0573b801d (diff)
downloadgdk-pixbuf-f359d6150a5a63cb10dd7f64fa6e33229a1183be.tar.gz
Meson: Disable tests that needs resources on Windows
To be working on Windows we need to fix meson gnome module first: https://github.com/mesonbuild/meson/issues/8266.
-rw-r--r--tests/meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/meson.build b/tests/meson.build
index 8475f5f5c..53ae0fb38 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,10 @@
# Resources contain PNG and BMP files, so we need these two loaders
# enabled in order to build them
-if enabled_loaders.contains('png')
+# FIXME: On Windows glib-compile-resources will fail to execute
+# gdk-pixbuf-pixdata from build directory because it needs all DLL locations in
+# $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with
+# this problem: See https://github.com/mesonbuild/meson/issues/8266.
+if enabled_loaders.contains('png') and host_system != 'windows'
# 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