Merge lp:~andreas-pokorny/mir/band-aid-1521651 into lp:mir

[Andreas Pokorny]

Disable x11 input platform when --vt is specified on comand line, this is in line.

This is still just a bandaid. It avoids the actual cause... A bit ugly because it uses an option of the kms platform to decide whether it can be enabled. (In some respect this is similar to the test for host-socket)

[Alberto Aguirre (albaguirre)]

Works here.

review: Approve

[Alan Griffiths (alan-griffiths)]

I agree it is ugly, but as a *temporary* workaround it avoids an embarrassing regression. On which basis I'd prefer to see a "// TODO" comment about resolving this.

I assume we'll create a more specific bug and mark the linked one fixed?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3162
http://jenkins.qa.ubuntu.com/job/mir-ci/5744/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5099
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/75/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5099
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5099/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7629
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25716
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/73/console

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

I think we need a bug or another way to track that the bandaid is properly fixed at some point in the near future too. LGTM as a bandaid.

Also, waiting on this for 0.18

review: Approve

[Kevin DuBois (kdub)]

made a bug to track: https://bugs.launchpad.net/mir/+bug/1522104
top-approving

[Alan Griffiths (alan-griffiths)]

> made a bug to track: https://bugs.launchpad.net/mir/+bug/1522104
> top-approving

Cool

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5160
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4066/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/46
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/46
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5108
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5108/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7638
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25736

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

NestedServer.display_configuration_reset_when_application_exits failed, which seems unrelated. Trying again.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platforms/mesa/server/x11/input/input.cpp'
--- src/platforms/mesa/server/x11/input/input.cpp	2015-11-25 20:26:59 +0000
+++ src/platforms/mesa/server/x11/input/input.cpp	2015-12-02 13:29:29 +0000
@@ -48,7 +48,7 @@
     mo::Option const& options)
 {
     mir::assert_entry_point_signature<mi::ProbePlatform>(&probe_input_platform);
-    if (options.is_set("host-socket"))
+    if (options.is_set("host-socket") || options.is_set("vt"))
         return mi::PlatformPriority::unsupported;
 
     auto display_available = x11_resources.get_conn() != nullptr;

=== modified file 'tests/unit-tests/input/test_input_platform_probing.cpp'
--- tests/unit-tests/input/test_input_platform_probing.cpp	2015-11-20 15:25:12 +0000
+++ tests/unit-tests/input/test_input_platform_probing.cpp	2015-12-02 13:29:29 +0000
@@ -53,6 +53,7 @@
     void add(mir::ModuleEmergencyCleanupHandler) override {}
 };
 char const platform_input_lib[] = "platform-input-lib";
+char const vt[] = "vt";
 char const platform_path[] = "platform-path";
 
 struct InputPlatformProbe : ::testing::Test
@@ -147,6 +148,17 @@
 
     EXPECT_THAT(platforms, UnorderedElementsAre(OfPtrType<mi::evdev::Platform>(), OfPtrType<mi::X::XInputPlatform>()));
 }
+
+TEST_F(InputPlatformProbe, x11_input_platform_not_used_when_vt_specified)
+{
+    ON_CALL(mock_options, is_set(StrEq(vt))).WillByDefault(Return(true));
+    auto platforms =
+        mi::probe_input_platforms(mock_options, mt::fake_shared(stub_emergency), mt::fake_shared(mock_registry),
+                                  mr::null_input_report(), *stub_prober_report);
+
+    EXPECT_THAT(platforms, ElementsAre(OfPtrType<mi::evdev::Platform>()));
+}
+
 #endif
 
 TEST_F(InputPlatformProbe, allows_forcing_stub_input_platform)