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

style tests: Clean up --generate support

Browse Source 
Reshuffle things so we don't call gtk_test_init() when --generate
is passed, to avoid polluting the output with test spew.
This commit is contained in:
Matthias Clasen 2020-01-17 20:57:51 -05:00
parent d4f3979896
commit d9b1a1ebb1
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
testsuite/css/style/test-css-style.c
View File

@ -243,16 +243,26 @@ int
main (int argc, char **argv)
{
g_setenv ("GTK_CSS_DEBUG", "1", TRUE);
g_setenv ("GTK_THEME", "Empty", TRUE);
if (argc >= 2 && strcmp (argv[1], "--generate") == 0)
gtk_init ();
else
gtk_test_init (&argc, &argv);
if (argc >= 3 && strcmp (argv[1], "--generate") == 0)
{
GFile *file = g_file_new_for_commandline_arg (argv[2]);
gtk_init ();
g_object_set (gtk_settings_get_default (), "gtk-font-name", "Sans", NULL);
load_ui_file (file, TRUE);
g_object_unref (file);
return 0;
}
gtk_test_init (&argc, &argv);
g_object_set (gtk_settings_get_default (), "gtk-font-name", "Sans", NULL);
g_object_set (gtk_settings_get_default (),
"gtk-font-name", "Sans",
"gtk-theme-name", "Empty",
NULL);
if (argc < 2)
{
const char *basedir;
@ -264,17 +274,6 @@ main (int argc, char **argv)
g_object_unref (dir);
}
else if (strcmp (argv[1], "--generate") == 0)
{
if (argc >= 3)
{
GFile *file = g_file_new_for_commandline_arg (argv[2]);
load_ui_file (file, TRUE);
g_object_unref (file);
}
}
else
{
guint i;