AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
testsuite: Set GDK_DEBUG unconditionally

See merge request GNOME/gtk!4116
This commit is contained in:
Matthias Clasen 2021-11-04 01:15:31 +00:00
commit 9a31922709
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testsuite/meson.build
View File

@ -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

27
testsuite/reftests/gtk-reftest.c
View File

@ -157,7 +157,7 @@ get_components_of_test_file (const char *test_file,
if (basename)
{
char *base = g_path_get_basename (test_file);
if (g_str_has_suffix (base, ".ui"))
base[strlen (base) - strlen (".ui")] = '\0';
@ -241,7 +241,7 @@ add_extra_css (const char *testname,
{
GtkStyleProvider *provider = NULL;
char *css_file;
css_file = get_test_file (testname, extension, TRUE);
if (css_file == NULL)
return NULL;
@ -254,7 +254,7 @@ add_extra_css (const char *testname,
GTK_STYLE_PROVIDER_PRIORITY_FORCE);
g_free (css_file);
return provider;
}
@ -276,7 +276,7 @@ save_image (GdkTexture *texture,
GError *error = NULL;
char *filename;
gboolean ret;
filename = get_output_file (test_name, extension, &error);
if (filename == NULL)
{
@ -301,7 +301,7 @@ save_node (GskRenderNode *node,
char *filename;
gboolean ret;
GBytes *bytes;
filename = get_output_file (test_name, extension, &error);
if (filename == NULL)
{
@ -444,7 +444,7 @@ add_test_for_file (GFile *file)
g_object_unref (info);
}
g_assert_no_error (error);
g_object_unref (enumerator);
@ -505,16 +505,17 @@ 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
@ -525,7 +526,7 @@ main (int argc, char **argv)
GFile *dir;
dir = g_file_new_for_path (basedir);
add_test_for_file (dir);
g_object_unref (dir);