Ensure meta context is initialized once and use built-in GLib.Test flag

Author: lenemter

tests/Main.vala

@@ -5,23 +5,6 @@
 
 namespace Gala {
     public int main (string[] args) {
-        string? test_name = null;
-
-        OptionEntry[] entries = {
-            { "test-name", 't', NONE, STRING, ref test_name, null, null },
-            { null }
-        };
-
-        var context = new OptionContext ("io.elementary.gala.tests");
-        context.add_main_entries (entries, null);
-
-        try {
-            context.parse (ref args);
-        } catch (Error e) {
-            Test.message ("Option parsing failed: %s", e.message);
-            return 1;
-        }
-
         Type[] test_types = {
             typeof (SetupTest),
             typeof (GestureControllerTest),
@@ -32,12 +15,7 @@ namespace Gala {
         Object[] tests = {};
 
         for (var i = 0; i < test_types.length; i++) {
-            unowned var test_type = test_types[i];
-
-            var should_launch_test = test_name == null || test_type.name () == "Gala%s".printf (test_name);
-            if (should_launch_test) {
-                tests += GLib.Object.new_with_properties (test_type, {}, {});
-            }
+            tests += GLib.Object.new_with_properties (test_types[i], {}, {});
         }
 
         Test.init (ref args);

tests/MutterTestCase.vala

@@ -25,12 +25,16 @@ public abstract class Gala.MutterTestCase : Gala.TestCase {
         "--virtual-monitor", "1280x720@60"
     };
 
-    protected Meta.Context context { get; private set; }
-    protected Clutter.Stage stage { get { return (Clutter.Stage) context.get_backend ().get_stage (); } }
+    protected static Meta.Context? context { get; private set; }
+    protected static Clutter.Stage? stage { get { return (Clutter.Stage) context?.get_backend ().get_stage (); } }
 
     private MainLoop? main_loop;
 
     construct {
+        if (context != null) {
+            return;
+        }
+
         context = new Meta.Context ("");
 
         unowned var unowned_args = MUTTER_ARGS;

tests/lib/SetupTest.vala

@@ -35,7 +35,7 @@ public class Gala.SetupTest : MutterTestCase {
         var stage = backend.get_stage ();
         assert_true (stage != null);
         assert_true (stage is Clutter.Stage);
-        assert_true (this.stage == stage);
+        assert_true (MutterTestCase.stage == stage);
 
         // Creating an actor requires clutter machinery to be set up, so check this
         var actor = new Clutter.Actor ();

tests/meson.build

@@ -26,6 +26,5 @@ test_executable = executable(
 )
 
 foreach lib_test : lib_tests
-    test(lib_test, test_executable, args: ['--test-name=@0@'.format(lib_test)], suite: ['Gala'], is_parallel: false)
+    test(lib_test, test_executable, args: ['-p', '/Gala@0@'.format(lib_test)], suite: ['Gala'], is_parallel: false)
 endforeach
-