Unity 8

Merge lp:~aacid/unity8/oxide_regression_workaround into lp:unity8

  1. oxide_regression_workaround
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-05-27
Status: Merged
Approved by: Michael Zanetti on 2015-05-27
Approved revision: 1792
Merged at revision: 1810
Proposed branch: lp:~aacid/unity8/oxide_regression_workaround
Merge into: lp:unity8
Diff against target: 9 lines (+1/-1)
1 file modified
tests/qmltests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/oxide_regression_workaround
Reviewer Review Type Date Requested Status
Michael Zanetti (community) 2015-05-27 Approve on 2015-05-27
PS Jenkins bot continuous-integration Approve on 2015-05-27
Review via email: mp+260271@code.launchpad.net

Commit Message

workaround oxide 1.7 issue

See bug #1459142

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Test only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

 * Did you have a look at the warnings when running tests? Can they be reduced?
No new warnings introduced

To post a comment you must log in.
Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

waiting for Jenkins... Not top-approving yet.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1792
http://jenkins.qa.ubuntu.com/job/unity8-ci/5773/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/52
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20762

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

review: Approve (continuous-integration)
Michael Zanetti (mzanetti) wrote :

Grass is greener on this side!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/CMakeLists.txt'
2--- tests/qmltests/CMakeLists.txt 2015-05-18 23:04:19 +0000
3+++ tests/qmltests/CMakeLists.txt 2015-05-27 10:29:02 +0000
4@@ -93,4 +93,4 @@
5 add_qml_test(Stages WindowMoveResizeArea)
6 add_qml_test(Stages Splash)
7 add_qml_test(Tutorial Tutorial)
8-add_qml_test(Wizard Wizard)
9+add_qml_test(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")

Subscribers

People subscribed via source and target branches