Merge branch 'wip/otte/win32-fixes' into 'main'

testsuite/win32: Various fixes

See merge request GNOME/gtk!7877

testsuite/gsk/misc.c

@@ -155,7 +155,6 @@ test_renderer (GskRenderer *renderer)
   GdkDisplay *display;
   gboolean realized;
   GdkSurface *surface;
-  gboolean res;
   GError *error = NULL;
 
   g_assert (GSK_IS_RENDERER (renderer));
@@ -172,24 +171,30 @@ test_renderer (GskRenderer *renderer)
 
   g_assert_null (gsk_renderer_get_surface (renderer));
 
-  surface = gdk_surface_new_toplevel (display);
+  surface = gdk_surface_new_toplevel (display ? display : gdk_display_get_default ());
 
-  res = gsk_renderer_realize (renderer, surface, &error);
+  if (!gsk_renderer_realize (renderer, surface, &error))
+    {
+      g_test_skip_printf ("%s not available: %s", G_OBJECT_TYPE_NAME (renderer), error->message);
+    }
+  else
+    {
+      g_assert_no_error (error);
 
-  g_assert_no_error (error);
-  g_assert_true (res);
+      g_assert_true (gsk_renderer_is_realized (renderer));
+      g_assert_true (gsk_renderer_get_surface (renderer) == surface);
 
-  g_assert_true (gsk_renderer_is_realized (renderer));
-  g_assert_true (gsk_renderer_get_surface (renderer) == surface);
-
-  gsk_renderer_unrealize (renderer);
+      gsk_renderer_unrealize (renderer);
+    }
 
   g_assert_false (gsk_renderer_is_realized (renderer));
   g_assert_null (gsk_renderer_get_surface (renderer));
 
   gdk_surface_destroy (surface);
 
-  gdk_display_close (display);
+  if (display)
+    gdk_display_close (display);
+
 }
 
 static void

testsuite/introspection/api.py

@@ -1,19 +1,7 @@
 #! /usr/bin/env python3
 
-import os
 import sys
 
-# Python 3.8.x or later on Windows require os.add_dll_directory()
-# to be called on every directory that contains the required
-# non-bundled, non-system DLLs of a module so that the module can
-# be loaded successfully by Python.  Make things easiler for people
-# by calling os.add_dll_directory() on the valid paths in %PATH%.
-if hasattr(os, 'add_dll_directory'):
-    paths = reversed(os.environ['PATH'].split(os.pathsep))
-    for path in paths:
-        if path != '' and os.path.isdir(path):
-            os.add_dll_directory(path)
-
 try:
     import gi
 except ImportError:

testsuite/introspection/meson.build

@@ -2,10 +2,14 @@ env = environment()
 env.prepend('GI_TYPELIB_PATH',
   project_build_root / 'gtk',
 )
-env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so')
+
+if host_machine.system() == 'windows'
+  env.prepend('PATH', project_build_root / 'gtk')
+endif
 
 test('api',
   find_program('api.py', dirs: meson.current_source_dir()),
   suite: ['introspection'],
+  depends: [ gtk_gir, libgtk ],
   env: env,
 )