Merge lp:~timo-jyrinki/click-update-manager/fix_qt52_use_qpa_platform_minimal into lp:click-update-manager

[Timo Jyrinki]

Use xvfb -screen 0 640x480x24 for running tests. (LP: #1271172)

Similar changes are being done in all packages needing it, like http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk/revision/43

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-trusty-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-update-manager-ci/42/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

There is absolutely no information in the bug that describes the problem, or why this would fix it. Please provide that information.

review: Needs Information

[Timo Jyrinki (timo-jyrinki)]

See https://bugs.launchpad.net/click-update-manager/+bug/1271172/comments/3 for the omitted information.

[dobey (dobey)]

What does setting the platform to "minimal" actually do there? Would not adding "-screen 0 640x480x24" to the xvfb-run args list, be a better fix?

Or if we should use "minimal" for platform, should we not do this in the build system rather than debian/rules, and remove the use of xvfb-run?

Changes like this, we should do always or never; not only in debian/rules.

[Timo Jyrinki (timo-jyrinki)]

The minimal plugin avoids using X while still allowing QML tests to be run and doing the rendering, just not the final stage of outputting to X. Some tests may be hard to run without accelerated OpenGL since QML2 requires OpenGL 2.0 / shaders etc. But a PPA test shows that your suggested method also works, and it might be better since there's a X virtual framebuffer in the picture. Changing the proposal to that.

[lp:~timo-jyrinki/click-update-manager/fix_qt52_use_qpa_platform_minimal]

39. By Timo Jyrinki on 2014-01-24

Use xvfb -screen 0 640x480x24 instead of minimal platform plugin

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-trusty-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-update-manager-ci/43/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-14 11:33:57 +0000
+++ CMakeLists.txt	2014-01-24 06:34:13 +0000
@@ -18,7 +18,7 @@
 ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
 
 add_custom_target(check
-    COMMAND xvfb-run -a qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit
+    COMMAND xvfb-run -s '-screen 0 640x480x24' -a qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit
 )
 
 add_subdirectory(tests/autopilot)