Merge branch 'reftest-no-blink' into 'master'

testsuite: Set GDK_DEBUG unconditionally

See merge request GNOME/gtk!4116

testsuite/meson.build

@@ -8,12 +8,9 @@ common_env = [
   'GTK_CSD=1',
   'G_ENABLE_DIAGNOSTIC=0',
   'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
+  'GDK_DEBUG=default-settings',
 ]
 
-if get_option('debug')
-  common_env += [ 'GDK_DEBUG=default-settings' ]
-endif
-
 if x11_enabled
   add_test_setup ('x11',
                   env: common_env + [
@@ -30,16 +27,11 @@ if wayland_enabled
                         'TEST_OUTPUT_SUBDIR=wayland',
                         ])
 
-  if get_option('debug')
-    gdk_debug = 'GDK_DEBUG=gl-gles,default-settings'
-  else
-    gdk_debug = 'GDK_DEBUG=gl-gles'
-  endif
   add_test_setup ('waylandgles',
                   env: common_env + [
                         'GDK_BACKEND=wayland',
                         'TEST_OUTPUT_SUBDIR=waylandgles',
-                        gdk_debug,
+                        'GDK_DEBUG=gl-gles,default-settings',
                         ])
 
 endif

testsuite/reftests/gtk-reftest.c

@@ -506,15 +506,16 @@ main (int argc, char **argv)
   const char *basedir;
   int result;
 
-  /* I don't want to fight fuzzy scaling algorithms in GPUs,
-   * so unless you explicitly set it to something else, we
-   * will use Cairo's image surface.
-   */
-  g_setenv ("GDK_RENDERING", "image", FALSE);
-
   if (!parse_command_line (&argc, &argv))
     return 1;
 
+  /* Override some settings that otherwise might affect
+   * the reliability of our output.
+   */
+  g_object_set (gtk_settings_get_default (),
+                "gtk-cursor-blink", FALSE,
+                NULL);
+
   if (arg_base_dir)
     basedir = arg_base_dir;
   else