Merge branch 'testsuite_fix_display_x11_on_win32' into 'main'

testsuite: don't run x11-specific tests if disabled

See merge request GNOME/gtk!6657

testsuite/gdk/meson.build

@@ -13,9 +13,7 @@ tests = [
   { 'name': 'contentformats' },
   { 'name': 'contentserializer' },
   { 'name': 'cursor' },
-  { 'name': 'display' },
   { 'name': 'displaymanager' },
-  { 'name': 'encoding' },
   { 'name': 'glcontext' },
   { 'name': 'keysyms' },
   { 'name': 'memorytexture' },
@@ -27,6 +25,13 @@ tests = [
   { 'name': 'popuplayout' },
 ]
 
+if x11_enabled
+  tests += [
+    { 'name': 'display' },
+    { 'name': 'encoding' },
+  ]
+endif
+
 foreach t : tests
   test_name = t.get('name')
   test_exe = executable(test_name,

testsuite/gtk/meson.build

@@ -100,12 +100,17 @@ tests = [
   { 'name': 'treesorter' },
   { 'name': 'treeview' },
   { 'name': 'typename' },
-  { 'name': 'displayclose' },
   { 'name': 'revealer-size' },
   { 'name': 'widgetorder' },
   { 'name': 'widget-refcount' },
 ]
 
+if x11_enabled
+  tests += [
+    { 'name': 'displayclose' },
+  ]
+endif
+
 # Tests that test private apis and therefore are linked against libgtk-4.a
 internal_tests = [
   { 'name': 'bitmask' },