Unity

Merge lp:~mzanetti/unity/phablet-deebug into lp:unity/phablet

  1. phablet-deebug
  2. Merge into phablet
Proposed by Michael Zanetti
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: no longer in the source branch.
Merged at revision: 611
Proposed branch: lp:~mzanetti/unity/phablet-deebug
Merge into: lp:unity/phablet
Diff against target: 29 lines (+1/-6)
3 files modified
tests/qmltests/CMakeLists.txt (+1/-1)
tests/qmltests/plugins/CMakeLists.txt (+0/-1)
tests/qmltests/plugins/Dee/CMakeLists.txt (+0/-4)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-deebug
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel d'Andrada (community) Approve
Review via email: mp+159773@code.launchpad.net

Commit message

fix import paths of for filtergrid tests

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:611
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/643/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/645
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/645/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/519
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/519/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1164

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/643/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:612
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/647/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/453/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/649
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/523
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1169

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/647/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:612
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/648/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/454/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/650
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/524
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/524/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1170

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/648/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks good to me.

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

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 2013-04-18 17:57:45 +0000
3+++ tests/qmltests/CMakeLists.txt 2013-04-19 09:50:34 +0000
4@@ -37,7 +37,7 @@
5 add_qml_test(Components PageHeader)
6 add_qml_test(Dash DashPreview)
7 add_qml_test(Dash PeoplePreview)
8-add_qml_test(Dash FilterGrids IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
9+add_qml_test(Dash FilterGrids IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins)
10 add_qml_test(Greeter Greeter)
11 add_qml_test(Hud Hud IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/plugins)
12 add_qml_test(Launcher Launcher)
13
14=== modified file 'tests/qmltests/plugins/CMakeLists.txt'
15--- tests/qmltests/plugins/CMakeLists.txt 2013-04-18 11:13:16 +0000
16+++ tests/qmltests/plugins/CMakeLists.txt 2013-04-19 09:50:34 +0000
17@@ -1,3 +1,2 @@
18 add_subdirectory(HudClient)
19 add_subdirectory(Ubuntu)
20-add_subdirectory(Dee)
21
22=== removed file 'tests/qmltests/plugins/Dee/CMakeLists.txt'
23--- tests/qmltests/plugins/Dee/CMakeLists.txt 2013-04-18 11:13:16 +0000
24+++ tests/qmltests/plugins/Dee/CMakeLists.txt 1970-01-01 00:00:00 +0000
25@@ -1,4 +0,0 @@
26-# copy qmldir file into build directory for shadow builds
27-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
28- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
29- )

Subscribers

People subscribed via source and target branches