[mutter] tests/headless-start: Port to MetaContext



commit f8465906ddcd4a4d2ac53081c7312cda262cd163
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Tue Mar 2 19:51:54 2021 +0100

    tests/headless-start: Port to MetaContext
    
    Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>

 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 660819583c..e0b8be0fc3 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);
-
-  meta_plugin_manager_load (test_get_plugin_name ());
-
-  meta_override_compositor_configuration (META_COMPOSITOR_TYPE_WAYLAND,
-                                          META_TYPE_BACKEND_TEST,
-                                          NULL);
+  g_autoptr (MetaContext) context = NULL;
 
-  meta_init ();
-  meta_register_with_session ();
+  context = meta_create_test_context (META_CONTEXT_TEST_TYPE_NESTED);
+  g_assert (meta_context_configure (context, &argc, &argv, NULL));
 
-  g_idle_add (run_tests, NULL);
+  init_tests ();
 
-  return meta_run ();
+  return meta_context_test_run_tests (META_CONTEXT_TEST (context));
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]