isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests/persistent-virtual-monitor: Port to MetaContext

Browse Source 
Since this tests the `--virtual-monitor` command line argument, it uses
the `MetaContextMain` variant of the context, as it's there that command
line argument is handled.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
Jonas Ådahl 2021-03-03 12:01:11 +01:00
parent 725510ea29
commit 1d4224ab07
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/tests/native-persistent-virtual-monitor.c
View File

@ -22,14 +22,14 @@
#include "backends/meta-logical-monitor.h" #include "backends/meta-logical-monitor.h"
#include "backends/meta-monitor-manager-private.h" #include "backends/meta-monitor-manager-private.h"
#include "compositor/meta-plugin-manager.h" #include "meta/meta-context.h"
#include "meta/main.h"
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
#include "tests/test-utils.h" #include "tests/test-utils.h"
static gboolean static gboolean
wait_for_paint (gpointer data) wait_for_paint (gpointer user_data)
{ {
MetaContext *context = user_data;
MetaBackend *backend = meta_get_backend (); MetaBackend *backend = meta_get_backend ();
ClutterActor *stage = meta_backend_get_stage (backend); ClutterActor *stage = meta_backend_get_stage (backend);
MetaMonitorManager *monitor_manager = MetaMonitorManager *monitor_manager =
@ -65,7 +65,7 @@ wait_for_paint (gpointer data)
g_main_loop_run (loop); g_main_loop_run (loop);
meta_quit (META_EXIT_SUCCESS); meta_context_terminate (context);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -75,7 +75,7 @@ main (int argc,
char **argv) char **argv)
{ {
char *fake_args[] = { char *fake_args[] = {
NULL, argv[0],
(char *) "--wayland", (char *) "--wayland",
(char *) "--headless", (char *) "--headless",
(char *) "--virtual-monitor", (char *) "--virtual-monitor",
@ -83,24 +83,18 @@ main (int argc,
}; };
char **fake_argv = fake_args; char **fake_argv = fake_args;
int fake_argc = G_N_ELEMENTS (fake_args); int fake_argc = G_N_ELEMENTS (fake_args);
GOptionContext *ctx; g_autoptr (MetaContext) context = NULL;
GError *error = NULL; g_autoptr (GError) error = NULL;
test_init (&argc, &argv); context = meta_create_context ("Persistent virtual monitor test");
g_assert (meta_context_configure (context, &fake_argc, &fake_argv, &error));
meta_context_set_plugin_name (context, test_get_plugin_name ());
g_assert (meta_context_setup (context, &error));
g_assert (meta_context_start (context, &error));
fake_args[0] = argv[0]; g_idle_add (wait_for_paint, context);
ctx = meta_get_option_context (); g_assert (meta_context_run_main_loop (context, &error));
if (!g_option_context_parse (ctx, &fake_argc, &fake_argv, &error))
g_error ("Failed to parse fake command line arguments: %s", error->message);
g_option_context_free (ctx);
meta_plugin_manager_load (test_get_plugin_name ()); return EXIT_SUCCESS;
meta_init ();
meta_register_with_session ();
g_idle_add (wait_for_paint, NULL);
return meta_run ();
} }