Merge lp:~thomas-voss/mir/wait-for-vt-to-become-active-before-setting-mode into lp:~mir-team/mir/trunk

[Thomas Voß]

Wait for vt to become active if we need to activate it.

Wait for vt to become active if we need to activate it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:767
http://jenkins.qa.ubuntu.com/job/mir-ci/804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/894
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/480

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

seems sensible

review: Approve

[Robert Ancell (robert-ancell)]

Evil VT API...

review: Approve

[Daniel van Vugt (vanvugt)]

Is this a fix for bug 1194054? I will have to test...

=== modified file 'src/server/graphics/gbm/linux_virtual_terminal.cpp'
--- src/server/graphics/gbm/linux_virtual_terminal.cpp	2013-06-21 01:43:11 +0000
+++ src/server/graphics/gbm/linux_virtual_terminal.cpp	2013-06-24 14:43:45 +0000
@@ -207,7 +207,8 @@
                     std::runtime_error("Failed to activate VT"))
                         << boost::errinfo_file_name(active_vt_path)
                         << boost::errinfo_errno(errno));
-        }      
+        }
+        status = fops->ioctl(vt_fd, VT_WAITACTIVE, vt_number);
     }
 
     return vt_fd;
 
=== modified file 'tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp'
--- tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp	2013-06-21 01:43:11 +0000
+++ tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp	2013-06-24 14:43:45 +0000
@@ -126,8 +126,13 @@
             .WillOnce(Return(fake_vt_fd));
 
         if (activate)
+        {
             EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_ACTIVATE, vt_num))
-                .WillOnce(Return(0));     
+                    .WillOnce(Return(0));
+
+            EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, VT_WAITACTIVE, vt_num))
+                    .WillOnce(Return(0));
+        }
 
         EXPECT_CALL(mock_fops, ioctl(fake_vt_fd, KDGETMODE, An<void*>()))
             .WillOnce(DoAll(SetIoctlPointee<int>(fake_kd_mode), Return(0)));