From f1fce5253eaac6bd877dfc0621433f5943c7a166 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 17 Jan 2020 17:02:43 -0500 Subject: [PATCH] node 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. --- testsuite/css/nodes/test-css-nodes.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/testsuite/css/nodes/test-css-nodes.c b/testsuite/css/nodes/test-css-nodes.c index 334b60a11c..54664c7d45 100644 --- a/testsuite/css/nodes/test-css-nodes.c +++ b/testsuite/css/nodes/test-css-nodes.c @@ -231,6 +231,19 @@ main (int argc, char **argv) { g_setenv ("GTK_CSS_DEBUG", "1", TRUE); + if (argc >=3 && strcmp (argv[1], "--generate") == 0) + { + GFile *file = g_file_new_for_commandline_arg (argv[2]); + + gtk_init (); + + load_ui_file (file, TRUE); + + g_object_unref (file); + + return 0; + } + gtk_test_init (&argc, &argv); if (argc < 2) @@ -244,17 +257,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; -- 2.30.2