Merge lp:~aacid/qtmir/load_generic_sensors_test_5_4_1 into lp:qtmir

[Albert Astals Cid]

Make the test pass with Qt >= 5.4.1

[lp:~aacid/qtmir/load_generic_sensors_test_5_4_1]

325. By Albert Astals Cid on 2015-03-05

Set envvar only if not set

[Michał Sawicz (saviq)]

Yeaaah, ok :P

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:325
http://jenkins.qa.ubuntu.com/job/qtmir-ci/229/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/80/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Added to silo 012 and it worked https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-012/+packages

=== modified file 'tests/mirserver/Screen/screen_test.cpp'
--- tests/mirserver/Screen/screen_test.cpp	2014-10-16 18:27:04 +0000
+++ tests/mirserver/Screen/screen_test.cpp	2015-03-05 16:24:00 +0000
@@ -51,6 +51,11 @@
 
 TEST(ScreenTest, OrientationSensor)
 {
+    if (!qEnvironmentVariableIsSet("QT_ACCEL_FILEPATH")) {
+        // Trick Qt >= 5.4.1 to load the generic sensors
+        qputenv("QT_ACCEL_FILEPATH", "dummy");
+    }
+
     Screen::skipDBusRegistration = true;
     Screen *screen = new Screen(fake_output);