style tests: Clean up --generate support

Reshuffle things so we don't call gtk_test_init() when --generate
is passed, to avoid polluting the output with test spew.

diff --git a/testsuite/css/style/test-css-style.c b/testsuite/css/style/test-css-style.c
index 9c9cbb18e553f1e0ba0837d141f321d760935263..c7c0bca3aa680b19d4be38d5dfc932230284dba1 100644 (file)
--- a/testsuite/css/style/test-css-style.c
+++ b/testsuite/css/style/test-css-style.c
@@ -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;