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

Proposed by Timo Jyrinki on 2014-01-21
Status: Merged
Approved by: dobey on 2014-01-24
Approved revision: 39
Merged at revision: 38
Proposed branch: lp:~timo-jyrinki/click-update-manager/fix_qt52_use_qpa_platform_minimal
Merge into: lp:click-update-manager
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/click-update-manager/fix_qt52_use_qpa_platform_minimal
Reviewer Review Type Date Requested Status
dobey (community) 2014-01-21 Approve on 2014-01-24
PS Jenkins bot (community) continuous-integration Approve on 2014-01-24
Review via email: mp+202461@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
dobey (dobey) wrote :

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
dobey (dobey) wrote :

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) wrote :

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.

39. By Timo Jyrinki on 2014-01-24

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

dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-10-14 11:33:57 +0000
3+++ CMakeLists.txt 2014-01-24 06:34:13 +0000
4@@ -18,7 +18,7 @@
5 ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
6
7 add_custom_target(check
8- COMMAND xvfb-run -a qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit
9+ COMMAND xvfb-run -s '-screen 0 640x480x24' -a qmltestrunner -input ${CMAKE_CURRENT_SOURCE_DIR}/tests/unit
10 )
11
12 add_subdirectory(tests/autopilot)

Subscribers

People subscribed via source and target branches