From f8465906ddcd4a4d2ac53081c7312cda262cd163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 2 Mar 2021 19:51:54 +0100 Subject: [PATCH] tests/headless-start: Port to MetaContext Part-of: --- src/tests/headless-start-test.c | 47 +++++---------------------------- 1 file changed, 7 insertions(+), 40 deletions(-) diff --git a/src/tests/headless-start-test.c b/src/tests/headless-start-test.c index 660819583..e0b8be0fc 100644 --- a/src/tests/headless-start-test.c +++ b/src/tests/headless-start-test.c @@ -22,35 +22,9 @@ #include "backends/meta-monitor-manager-private.h" #include "backends/meta-crtc.h" #include "backends/meta-output.h" -#include "compositor/meta-plugin-manager.h" #include "core/display-private.h" -#include "core/main-private.h" -#include "meta/main.h" -#include "meta/meta-enums.h" -#include "tests/meta-backend-test.h" +#include "tests/meta-context-test.h" #include "tests/meta-monitor-manager-test.h" -#include "tests/test-utils.h" -#include "wayland/meta-wayland.h" - -static gboolean -run_tests (gpointer data) -{ - MetaBackend *backend = meta_get_backend (); - MetaSettings *settings = meta_backend_get_settings (backend); - gboolean ret; - - meta_settings_override_experimental_features (settings); - - meta_settings_enable_experimental_feature ( - settings, - META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER); - - ret = g_test_run (); - - meta_quit (ret != 0); - - return FALSE; -} static void meta_test_headless_start (void) @@ -180,7 +154,7 @@ create_headless_test_setup (void) } static void -init_tests (int argc, char **argv) +init_tests (void) { meta_monitor_manager_test_init_test_setup (create_headless_test_setup); @@ -194,19 +168,12 @@ init_tests (int argc, char **argv) int main (int argc, char *argv[]) { - test_init (&argc, &argv); - init_tests (argc, argv); + g_autoptr (MetaContext) context = NULL; - meta_plugin_manager_load (test_get_plugin_name ()); + context = meta_create_test_context (META_CONTEXT_TEST_TYPE_NESTED); + g_assert (meta_context_configure (context, &argc, &argv, NULL)); - meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND, - META_TYPE_BACKEND_TEST, - NULL); + init_tests (); - meta_init (); - meta_register_with_session (); - - g_idle_add (run_tests, NULL); - - return meta_run (); + return meta_context_test_run_tests (META_CONTEXT_TEST (context)); }