Merge branch 'matthiasc/for-main' into 'main'

Try harder to fix focus tests

See merge request GNOME/gtk!5842

testsuite/gtk/meson.build

@@ -262,6 +262,7 @@ foreach test : focus_chain_tests
       join_paths(meson.current_source_dir(), 'focus-chain', test[0] + '.ui'),
       join_paths(meson.current_source_dir(), 'focus-chain', test[0] + '.' + test[1]),
     ],
+    is_parallel: false,
     env: test_env,
     suite: [ 'gtk', 'focus' ],
   )

testsuite/gtk/test-focus-chain.c

@@ -214,7 +214,11 @@ load_ui_file (GFile *ui_file,
   if (keep_running)
     g_source_remove (timeout_handle_id);
 
-  g_assert (gtk_window_is_active (GTK_WINDOW (window)));
+  if (!gtk_window_is_active (GTK_WINDOW (window)))
+    {
+      g_print ("Skipping focus tests because window did not get focus. Headless display?");
+      exit (77);
+    }
 
   if (ext)
     {