Unity 8

Merge lp:~saviq/unity8/cmake-pydev-fixes into lp:unity8

  1. cmake-pydev-fixes
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1041
Merged at revision: 1071
Proposed branch: lp:~saviq/unity8/cmake-pydev-fixes
Merge into: lp:unity8
Diff against target: 83 lines (+33/-11)
5 files modified
.project (+1/-1)
.pydevproject (+3/-1)
.settings/Autopilot List.launch (+14/-0)
.settings/Autopilot Run.launch (+14/-0)
tests/mocks/Ubuntu/Telephony/CMakeLists.txt (+1/-9)
To merge this branch: bzr merge lp:~saviq/unity8/cmake-pydev-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+226416@code.launchpad.net

Commit message

Move the PyDev project files to the root, supporting .py scripts outside of tests/autopilot.
Add Autopilot Run and List launch configurations to easily support debugging in Eclipse.
Use add_unity8_mock macro in the Telephony plugin.

Description of the change

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

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

 * 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

To post a comment you must log in.
lp:~saviq/unity8/cmake-pydev-fixes updated
1040. By Michał Sawicz

Add .bazaar and whitespace to the PyDev project.

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

FAILED: Continuous integration, rev:1039
http://jenkins.qa.ubuntu.com/job/unity8-ci/3402/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/496
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/496
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9674

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

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

FAILED: Continuous integration, rev:1039
http://jenkins.qa.ubuntu.com/job/unity8-ci/3417/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/511
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/511/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/511
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2998
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2998/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9733

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

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

FAILED: Continuous integration, rev:1040
http://jenkins.qa.ubuntu.com/job/unity8-ci/3428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1949
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/432/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/522
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/522/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9797

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

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

PASSED: Continuous integration, rev:1040
http://jenkins.qa.ubuntu.com/job/unity8-ci/3434/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/528
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/528/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3091
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3091/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9821

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

review: Approve (continuous-integration)
lp:~saviq/unity8/cmake-pydev-fixes updated
1041. By Michał Sawicz

Merge trunk

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

FAILED: Continuous integration, rev:1041
http://jenkins.qa.ubuntu.com/job/unity8-ci/3522/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2282
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/616
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/616
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3479
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10186

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'tests/autopilot/.project' => '.project'
2--- tests/autopilot/.project 2013-11-18 12:05:58 +0000
3+++ .project 2014-07-21 23:32:50 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <projectDescription>
7- <name>Unity8 Autopilot</name>
8+ <name>Unity8</name>
9 <comment></comment>
10 <projects>
11 </projects>
12
13=== renamed file 'tests/autopilot/.pydevproject' => '.pydevproject'
14--- tests/autopilot/.pydevproject 2013-11-18 12:05:58 +0000
15+++ .pydevproject 2014-07-21 23:32:50 +0000
16@@ -1,7 +1,9 @@
17 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
18 <?eclipse-pydev version="1.0"?><pydev_project>
19 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
20-<path>/Unity8 Autopilot</path>
21+<path>/Unity8/tests/autopilot</path>
22+<path>/Unity8/.bazaar</path>
23+<path>/Unity8/tests/whitespace</path>
24 </pydev_pathproperty>
25 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
26 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
27
28=== added directory '.settings'
29=== added file '.settings/Autopilot List.launch'
30--- .settings/Autopilot List.launch 1970-01-01 00:00:00 +0000
31+++ .settings/Autopilot List.launch 2014-07-21 23:32:50 +0000
32@@ -0,0 +1,14 @@
33+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
34+<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
35+<stringAttribute key="bad_container_name" value="/Unity8/.pyd"/>
36+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
37+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
38+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
39+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
40+</listAttribute>
41+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>
42+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
43+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="list unity8"/>
44+<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
45+<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>
46+</launchConfiguration>
47
48=== added file '.settings/Autopilot Run.launch'
49--- .settings/Autopilot Run.launch 1970-01-01 00:00:00 +0000
50+++ .settings/Autopilot Run.launch 2014-07-21 23:32:50 +0000
51@@ -0,0 +1,14 @@
52+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
53+<launchConfiguration type="org.python.pydev.debug.regularLaunchConfigurationType">
54+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"/>
55+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"/>
56+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
57+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
58+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
59+</listAttribute>
60+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/autopilot"/>
61+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_OTHER_WORKING_DIRECTORY" value=""/>
62+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="run ${string_prompt:the test suite to run:unity8}"/>
63+<stringAttribute key="org.python.pydev.debug.ATTR_INTERPRETER" value="__default"/>
64+<stringAttribute key="org.python.pydev.debug.ATTR_PROJECT" value="Unity8"/>
65+</launchConfiguration>
66
67=== modified file 'tests/mocks/Ubuntu/Telephony/CMakeLists.txt'
68--- tests/mocks/Ubuntu/Telephony/CMakeLists.txt 2014-04-30 18:06:38 +0000
69+++ tests/mocks/Ubuntu/Telephony/CMakeLists.txt 2014-07-21 23:32:50 +0000
70@@ -11,12 +11,4 @@
71
72 qt5_use_modules(FakeUbuntuTelephonyQml Core Quick)
73
74-# copy files into build directory for shadow builds
75-add_custom_target(UbuntuTelephonyQmlDirFile ALL
76- COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
77- DEPENDS qmldir
78-)
79-
80-install(TARGETS FakeUbuntuTelephonyQml
81- DESTINATION ${SHELL_INSTALL_QML}/mocks/Ubuntu/Telephony
82- )
83+add_unity8_mock(Ubuntu.Telephony 0.1 Ubuntu/Telephony TARGETS FakeUbuntuTelephonyQml)

Subscribers

People subscribed via source and target branches