Merge lp:~cemil-azizoglu/mir/use-options-during-probe into lp:mir

[Cemil Azizoglu]

Use command line options during platform probe.

Introduce a new PlatformPriority value (better) which is higher than what dummy uses (supported). Return best when a platform-specific option is passed in. This will help in differentiating between Mesa and X11 platforms when the server is launched from an xterm depending on the presence of the "--vt" option.

Use command line options during platform probe.

Introduce a new PlatformPriority value (better) which is higher than what dummy uses (supported). Return best when a platform-specific option is passed in. This will help in differentiating between Mesa and X11 platforms when the server is launched from an xterm depending on the presence of the "--vt" option.

Unmerged revisions

2750. By Cemil Azizoglu on 2015-07-16

Introduce a new priority level.

=== modified file 'include/platform/mir/graphics/platform.h'
--- include/platform/mir/graphics/platform.h	2015-07-16 06:17:56 +0000
+++ include/platform/mir/graphics/platform.h	2015-07-16 16:35:39 +0000
@@ -108,6 +108,8 @@
     supported = 128,    /**< Capable of providing a functioning Platform on this device,
                          *   possibly with degraded performance or features.
                          */
+    better = 192,       /**< Capable of providing a functioning Platform on this device.
+                         */
     best = 256          /**< Capable of providing a Platform with the best features and
                          *   performance this device is capable of.
                          */

=== modified file 'src/platforms/mesa/server/kms/platform.cpp'
--- src/platforms/mesa/server/kms/platform.cpp	2015-07-16 06:17:56 +0000
+++ src/platforms/mesa/server/kms/platform.cpp	2015-07-16 16:35:39 +0000
@@ -224,7 +224,14 @@
     for (auto& device : drm_devices)
     {
         static_cast<void>(device);
+<<<<<<< TREE
         return mg::PlatformPriority::best;
+=======
+        if (platform_option_used)
+            return mg::PlatformPriority::best;
+        else
+            return mg::PlatformPriority::better;
+>>>>>>> MERGE-SOURCE
     }
 
     return mg::PlatformPriority::unsupported;

=== modified file 'tests/mir_test_framework/platform_graphics_dummy.cpp'
--- tests/mir_test_framework/platform_graphics_dummy.cpp	2015-07-16 06:17:56 +0000
+++ tests/mir_test_framework/platform_graphics_dummy.cpp	2015-07-16 16:35:39 +0000
@@ -20,7 +20,7 @@
 
 mir::graphics::PlatformPriority probe_graphics_platform()
 {
-    return mir::graphics::supported;
+    return mir::graphics::PlatformPriority::supported;
 }
 
 mir::ModuleProperties const description {

=== modified file 'tests/unit-tests/graphics/mesa/kms/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2015-07-16 02:00:15 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2015-07-16 16:35:39 +0000
@@ -303,6 +303,7 @@
 TEST_F(MesaGraphicsPlatform, probe_returns_unsupported_when_no_drm_udev_devices)
 {
     mtf::UdevEnvironment udev_environment;
+<<<<<<< TREE
 
     mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
@@ -318,4 +319,39 @@
     mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
     EXPECT_EQ(mg::PlatformPriority::best, probe());
+=======
+    mir::options::ProgramOption options;
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::unsupported, probe(options));
+}
+
+TEST_F(MesaGraphicsPlatform, probe_returns_better_when_drm_devices_exist)
+{
+    mtf::UdevEnvironment udev_environment;
+    boost::program_options::options_description po;
+    mir::options::ProgramOption options;
+
+    udev_environment.add_standard_device("standard-drm-devices");
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::better, probe(options));
+}
+
+TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_vt_option_exist)
+{
+    mtf::UdevEnvironment udev_environment;
+    boost::program_options::options_description po;
+    mir::options::ProgramOption options;
+    const char *argv[] = {"dummy", "--vt"};
+    options.parse_arguments(po, 2, argv);
+
+    udev_environment.add_standard_device("standard-drm-devices");
+
+    mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
+    auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
+    EXPECT_EQ(mg::PlatformPriority::best, probe(options));
+>>>>>>> MERGE-SOURCE
 }