Merge lp:~kdub/mir/refix-1506707 into lp:mir

[Kevin DuBois]

fix: lp: #1506707 again after its reversion in lp:mir rev 3198, making sure to avoid regressions (lp: #1526225, lp: #1526505, lp: #1515558, lp: #1526209). Also add a test that would catch changes to this logic in the future (not present in the 0.18 patch)

fix: lp: #1506707 again after its reversion in lp:mir rev 3198, making sure to avoid regressions (lp: #1526225, lp: #1526505, lp: #1515558, lp: #1526209). Also add a test that would catch changes to this logic in the future (not present in the 0.18 patch)

testing notes testing against regressions: http://pastebin.ubuntu.com/14076079/

[Alberto Aguirre (albaguirre)]

16 + auto nested = options.is_set(host_socket);

Nit: could be const.

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3205
http://jenkins.qa.ubuntu.com/job/mir-ci/5876/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5351
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4258/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/202
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/202
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5301
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5301/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7811
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/182
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/38
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26172

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5876/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3206
http://jenkins.qa.ubuntu.com/job/mir-ci/5893/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5328
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/210/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/219
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/219/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5325
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5325/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7834
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/206
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/206/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/61/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26240

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5893/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

xenial-touch again (krillin-13)

dpkg: error processing archive /var/cache/apt/archives/libboost1.58-dev_1.58.0+dfsg-3.1ubuntu1_armhf.deb (--unpack):
 cannot copy extracted data for './usr/include/boost/phoenix/core/preprocessed/function_equal_10.hpp' to '/usr/include/boost/phoenix/core/preprocessed/function_equal_10.hpp.dpkg-new': failed to write (No space left on device)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
--- src/platforms/mesa/server/kms/platform_symbols.cpp	2015-12-15 20:13:12 +0000
+++ src/platforms/mesa/server/kms/platform_symbols.cpp	2015-12-18 12:35:49 +0000
@@ -36,6 +36,7 @@
 {
 char const* bypass_option_name{"bypass"};
 char const* vt_option_name{"vt"};
+char const* host_socket{"host-socket"};
 
 struct RealVTFileOperations : public mgm::VTFileOperations
 {
@@ -148,6 +149,7 @@
 
     if (options.is_set(vt_option_name))
         platform_option_used = true;
+    auto nested = options.is_set(host_socket);
 
     auto udev = std::make_shared<mir::udev::Context>();
 
@@ -156,15 +158,38 @@
     drm_devices.match_sysname("card[0-9]*");
     drm_devices.scan_devices();
 
+    if (drm_devices.begin() == drm_devices.end())
+        return mg::PlatformPriority::unsupported;
+
+    // Check for master
+    int tmp_fd = -1;
     for (auto& device : drm_devices)
     {
-        static_cast<void>(device);
-        if (platform_option_used)
+        tmp_fd = open(device.devnode(), O_RDWR | O_CLOEXEC);
+        if (tmp_fd >= 0)
+            break;
+    }
+
+    if (nested && platform_option_used)
+        return mg::PlatformPriority::best;
+    if (nested)
+        return mg::PlatformPriority::supported;
+
+    if (tmp_fd >= 0)
+    {
+        if (drmSetMaster(tmp_fd) >= 0)
+        {
+            drmDropMaster(tmp_fd);
+            drmClose(tmp_fd);
             return mg::PlatformPriority::best;
+        }
         else
-            return mg::PlatformPriority::supported;
+            drmClose(tmp_fd);
     }
 
+    if (platform_option_used)
+        return mg::PlatformPriority::best;
+
     return mg::PlatformPriority::unsupported;
 }
 

=== modified file 'src/platforms/mesa/server/x11/graphics/graphics.cpp'
--- src/platforms/mesa/server/x11/graphics/graphics.cpp	2015-12-15 20:13:12 +0000
+++ src/platforms/mesa/server/x11/graphics/graphics.cpp	2015-12-18 12:35:49 +0000
@@ -91,7 +91,7 @@
         drm_devices.scan_devices();
 
         if (drm_devices.begin() != drm_devices.end())
-            return mg::PlatformPriority::best;
+            return mg::PlatformPriority::supported;
     }
     return mg::PlatformPriority::unsupported;
 }

=== modified file 'tests/unit-tests/graphics/mesa/kms/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2015-12-15 20:13:12 +0000
+++ tests/unit-tests/graphics/mesa/kms/test_platform.cpp	2015-12-18 12:35:49 +0000
@@ -319,7 +319,7 @@
     EXPECT_EQ(mg::PlatformPriority::unsupported, probe(options));
 }
 
-TEST_F(MesaGraphicsPlatform, probe_returns_supported_when_drm_devices_exist)
+TEST_F(MesaGraphicsPlatform, probe_returns_best_when_master)
 {
     mtf::UdevEnvironment udev_environment;
     boost::program_options::options_description po;
@@ -329,7 +329,7 @@
 
     mir::SharedLibrary platform_lib{mtf::server_platform("graphics-mesa-kms")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
-    EXPECT_EQ(mg::PlatformPriority::supported, probe(options));
+    EXPECT_EQ(mg::PlatformPriority::best, probe(options));
 }
 
 TEST_F(MesaGraphicsPlatform, probe_returns_best_when_drm_devices_vt_option_exist)

=== modified file 'tests/unit-tests/graphics/mesa/x11/test_platform.cpp'
--- tests/unit-tests/graphics/mesa/x11/test_platform.cpp	2015-12-15 20:13:12 +0000
+++ tests/unit-tests/graphics/mesa/x11/test_platform.cpp	2015-12-18 12:35:49 +0000
@@ -116,7 +116,7 @@
     EXPECT_EQ(mg::PlatformPriority::unsupported, probe(options));
 }
 
-TEST_F(X11GraphicsPlatformTest, probe_returns_best_when_drm_render_nodes_exist)
+TEST_F(X11GraphicsPlatformTest, probe_returns_supported_when_drm_render_nodes_exist)
 {
     mtf::UdevEnvironment udev_environment;
     mir::options::ProgramOption options;
@@ -125,5 +125,5 @@
 
     mir::SharedLibrary platform_lib{mtf::server_platform("server-mesa-x11")};
     auto probe = platform_lib.load_function<mg::PlatformProbe>(probe_platform);
-    EXPECT_EQ(mg::PlatformPriority::best, probe(options));
+    EXPECT_EQ(mg::PlatformPriority::supported, probe(options));
 }

=== modified file 'tests/unit-tests/graphics/test_platform_prober.cpp'
--- tests/unit-tests/graphics/test_platform_prober.cpp	2015-12-15 20:13:12 +0000
+++ tests/unit-tests/graphics/test_platform_prober.cpp	2015-12-18 12:35:49 +0000
@@ -121,7 +121,7 @@
 }
 
 #ifdef MIR_BUILD_PLATFORM_MESA_KMS
-TEST(ServerPlatformProbe, LoadsMesaPlatformWhenDrmDevicePresent)
+TEST_F(ServerPlatformProbeMockDRM, LoadsMesaPlatformWhenDrmMasterCanBeAcquired)
 {
     using namespace testing;
     mir::options::ProgramOption options;
@@ -138,6 +138,34 @@
 
     EXPECT_THAT(description->name, HasSubstr("mesa-kms"));
 }
+
+//LP: #1526225, LP: #1526505, LP: #1515558, LP: #1526209
+TEST_F(ServerPlatformProbeMockDRM, returns_kms_platform_when_nested)
+{
+    using namespace testing;
+    ON_CALL(mock_drm, drmSetMaster(_))
+        .WillByDefault(Return(-1));
+
+    mir::options::ProgramOption options;
+    boost::program_options::options_description desc("");
+    desc.add_options()
+        ("host-socket", boost::program_options::value<std::string>(), "Host socket filename");
+    std::array<char const*, 3> args {{ "./aserver", "--host-socket", "/dev/null" }};
+    options.parse_arguments(desc, args.size(), args.data());
+
+    auto block_android = ensure_android_probing_fails();
+    auto block_mesa = ensure_mesa_probing_succeeds();
+
+    auto modules = available_platforms();
+
+    auto module = mir::graphics::module_for_device(modules, options);
+    ASSERT_NE(nullptr, module);
+
+    auto descriptor = module->load_function<mir::graphics::DescribeModule>(describe_module);
+    auto description = descriptor();
+
+    EXPECT_THAT(description->name, HasSubstr("mesa-kms"));
+}
 #endif
 
 #ifdef MIR_BUILD_PLATFORM_ANDROID
@@ -192,7 +220,7 @@
 }
 
 #if defined(MIR_BUILD_PLATFORM_MESA_KMS) || defined(MIR_BUILD_PLATFORM_MESA_X11) || defined(MIR_BUILD_PLATFORM_ANDROID)
-TEST(ServerPlatformProbe, LoadsMesaOrAndroidInPreferenceToDummy)
+TEST_F(ServerPlatformProbeMockDRM, LoadsMesaOrAndroidInPreferenceToDummy)
 {
     using namespace testing;
     mir::options::ProgramOption options;
@@ -212,7 +240,7 @@
 }
 #endif
 
-TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
+TEST_F(ServerPlatformProbeMockDRM, IgnoresNonPlatformModules)
 {
     using namespace testing;
     mir::options::ProgramOption options;