Ubuntu UI Toolkit Extras

Merge lp:~ahayzen/ubuntu-ui-extras/fix-1666556-build-depends into lp:ubuntu-ui-extras

  1. fix-1666556-build-depends
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 123
Merged at revision: 125
Proposed branch: lp:~ahayzen/ubuntu-ui-extras/fix-1666556-build-depends
Merge into: lp:ubuntu-ui-extras
Diff against target: 23 lines (+4/-1)
1 file modified
debian/control (+4/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-ui-extras/fix-1666556-build-depends
Reviewer Review Type Date Requested Status
Ken VanDine packaging Approve
Olivier Tilloy Approve
system-apps-ci-bot continuous-integration Pending
Review via email: mp+317955@code.launchpad.net

Commit message

* Add qtdeclarative5-dev-tools, qml-module-ubuntu-test and xvfb as build-deps
* Order build-deps alphabetically

Description of the change

* Add qtdeclarative5-dev-tools, qml-module-ubuntu-test and xvfb as build-deps
* Order build-deps alphabetically

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Using pbuilder I'm able to see that the tests now run:

make[1]: Entering directory '/build/ubuntu-ui-extras-0.2+17.04.20170116/obj-x86_64-linux-gnu'
Running tests...
/usr/bin/ctest --force-new-ctest-process -j1
Test project /build/ubuntu-ui-extras-0.2+17.04.20170116/obj-x86_64-linux-gnu
    Start 1: tst_actions_bar
1/6 Test #1: tst_actions_bar ..................... Passed 5.34 sec
    Start 2: tst_busy_indicator
2/6 Test #2: tst_busy_indicator .................. Passed 10.79 sec
    Start 3: tst_crop_drag_area
3/6 Test #3: tst_crop_drag_area .................. Passed 10.19 sec
    Start 4: tst_ExampleModelTests
4/6 Test #4: tst_ExampleModelTests ............... Passed 0.01 sec
    Start 5: tst_PhotoEditorPhoto
5/6 Test #5: tst_PhotoEditorPhoto ................ Passed 0.07 sec
    Start 6: tst_PhotoEditorPhotoImageProvider
6/6 Test #6: tst_PhotoEditorPhotoImageProvider ... Passed 0.05 sec

100% tests passed, 0 tests failed out of 6

Total Test time (real) = 26.45 sec

Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve (packaging)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-24 15:46:52 +0000
3+++ debian/control 2017-02-22 10:15:26 +0000
4@@ -5,15 +5,18 @@
5 Build-Depends: cmake (>= 2.8.9),
6 debhelper (>= 9),
7 gettext,
8+ libexiv2-dev,
9 pkg-config,
10 python:any,
11 qt5-default,
12 qtbase5-dev,
13 qtdeclarative5-dev,
14+ qtdeclarative5-dev-tools,
15 qml-module-qtquick2,
16 qml-module-qttest,
17 qml-module-ubuntu-components,
18- libexiv2-dev,
19+ qml-module-ubuntu-test,
20+ xvfb,
21 Standards-Version: 3.9.4
22 Homepage: https://launchpad.net/ubuntu-ui-extras
23 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging

Subscribers

People subscribed via source and target branches