ubuntu-system-settings

Merge lp:~aacid/ubuntu-system-settings/test_qpa into lp:ubuntu-system-settings

  1. test_qpa
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Iain Lane
Approved revision: 563
Merged at revision: 571
Proposed branch: lp:~aacid/ubuntu-system-settings/test_qpa
Merge into: lp:ubuntu-system-settings
Diff against target: 11 lines (+1/-0)
1 file modified
tests/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~aacid/ubuntu-system-settings/test_qpa
Reviewer Review Type Date Requested Status
Timo Jyrinki (community) Approve
PS Jenkins bot continuous-integration Approve
Iain Lane Approve
Review via email: mp+201943@code.launchpad.net

Commit message

Run tst_plugin test under the miminal QPA to prevent test failures in Qt5.

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Decent.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/586/rebuild

review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Works good when merged manually:
https://launchpad.net/%7Ecanonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3837705/+listing-archive-extra

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2013-10-01 07:42:02 +0000
3+++ tests/CMakeLists.txt 2014-01-16 15:15:19 +0000
4@@ -29,6 +29,7 @@
5 qt5_use_modules(tst-plugins Core Qml Test)
6 target_link_libraries(tst-plugins SystemSettings)
7 add_test(tst-plugins tst-plugins)
8+set_tests_properties(tst-plugins PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
9
10 qt5_use_modules(tst-arguments Core Test)
11 add_test(tst-arguments tst-arguments)

Subscribers

People subscribed via source and target branches