brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/runner: Recreate the virtual monitor for each test

Browse Source 
This ensures that the virtual monitor has an expected initial state each
test.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2554>
This commit is contained in:
Jonas Ådahl 2022-08-03 18:31:44 +02:00 committed by Marge Bot
parent 532c63e96c
commit 06d9ed3da7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tests/test-runner.c
View File

@ -42,6 +42,7 @@ typedef struct {
GString *warning_messages; GString *warning_messages;
GMainLoop *loop; GMainLoop *loop;
gulong x11_display_opened_handler_id; gulong x11_display_opened_handler_id;
MetaVirtualMonitor *virtual_monitor;
} TestCase; } TestCase;
static gboolean static gboolean
@ -98,6 +99,7 @@ test_case_new (MetaContext *context)
test->context = context; test->context = context;
test->clients = g_hash_table_new (g_str_hash, g_str_equal); test->clients = g_hash_table_new (g_str_hash, g_str_equal);
test->loop = g_main_loop_new (NULL, FALSE); test->loop = g_main_loop_new (NULL, FALSE);
test->virtual_monitor = meta_create_test_monitor (context, 800, 600, 60.0);
return test; return test;
} }
@ -1033,6 +1035,7 @@ test_case_destroy (TestCase *test,
meta_x11_display_set_alarm_filter (display->x11_display, NULL, NULL); meta_x11_display_set_alarm_filter (display->x11_display, NULL, NULL);
g_hash_table_destroy (test->clients); g_hash_table_destroy (test->clients);
g_object_unref (test->virtual_monitor);
g_free (test); g_free (test);
return TRUE; return TRUE;
@ -1158,9 +1161,6 @@ run_tests (MetaContext *context,
{ {
int i; int i;
gboolean success = TRUE; gboolean success = TRUE;
MetaVirtualMonitor *virtual_monitor;
virtual_monitor = meta_create_test_monitor (context, 800, 600, 60.0);
g_print ("1..%d\n", info->n_tests); g_print ("1..%d\n", info->n_tests);
@ -1170,7 +1170,6 @@ run_tests (MetaContext *context,
success = FALSE; success = FALSE;
} }
g_object_unref (virtual_monitor);
return success ? 0 : 1; return success ? 0 : 1;
} }