icon-validator: Allow custom path for icon validator via env

This allows setting a custom path for the icon validator, especially useful when testing without installing.
jsparber · Apr 4, 2024 · 730c5db · 730c5db
1 parent 832ee46
commit 730c5db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/meson.build b/src/meson.build
@@ -167,7 +167,8 @@ if bwrap.found()
   validate_icon_c_args += '-DHELPER="@0@"'.format(bwrap.full_path())
 endif
 
-executable(
+
+xdp_validate_icon = executable(
   'xdg-desktop-portal-validate-icon',
   'validate-icon.c',
   dependencies: [gdk_pixbuf_dep],

diff --git a/src/xdp-utils.c b/src/xdp-utils.c
@@ -2346,6 +2346,9 @@ xdp_validate_serialized_icon (GVariant  *v,
       return FALSE;
     }
 
+  if (g_getenv ("XDP_VALIDATE_ICON"))
+    icon_validator = g_getenv ("XDP_VALIDATE_ICON");
+
   if (!g_file_test (icon_validator, G_FILE_TEST_EXISTS))
     {
       g_warning ("Icon validation: %s not found, rejecting icon by default.", icon_validator);

diff --git a/tests/meson.build b/tests/meson.build
@@ -1,6 +1,7 @@
 env_tests = environment()
 env_tests.set('XDP_UNINSTALLED', '1')
 env_tests.set('XDG_DATA_DIRS', meson.current_build_dir() / 'share')
+env_tests.set('XDP_VALIDATE_ICON', xdp_validate_icon.full_path())
 env_tests.set('G_TEST_SRCDIR', meson.current_source_dir())
 env_tests.set('G_TEST_BUILDDIR', meson.current_build_dir())
 env_tests.set('G_DEBUG', 'gc-friendly')  # from glib-tap.mk