Ubuntu UI Toolkit

Merge lp:~cjwatson/ubuntu-ui-toolkit/src_test-depends into lp:ubuntu-ui-toolkit/staging

  1. src_test-depends
  2. Merge into staging
Proposed by Colin Watson on 2016-01-06
Status: Merged
Approved by: Timo Jyrinki on 2016-02-09
Approved revision: 1278
Merged at revision: 1841
Proposed branch: lp:~cjwatson/ubuntu-ui-toolkit/src_test-depends
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 11 lines (+1/-0)
1 file modified
src/src.pro (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/ubuntu-ui-toolkit/src_test-depends
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-02-09
PS Jenkins bot continuous-integration Needs Fixing on 2016-01-06
Zoltan Balogh (community) 2016-01-06 Approve on 2016-01-06
Review via email: mp+281713@code.launchpad.net

Commit Message

Make src/Ubuntu/Test depend on src/Ubuntu/Components, to fix build with high parallelisation.

Description of the Change

Make src/Ubuntu/Test depend on src/Ubuntu/Components, to fix build with high parallelisation.

I spent a while looking over the current build failures on powerpc, and noticed that src/Ubuntu/Test seems to be being built before src/Ubuntu/UbuntuGestures despite needing to link against its output. On inspection of the build system, there's nothing to prevent this; the only reason it happens on powerpc more than other architectures is that the current set of powerpc builders have a large number of CPUs and so run with high parallelisation by default.

Since I don't know qmake very well, I couldn't quite puzzle out exactly what the correct dependency would be, but requiring src/Ubuntu/Components to be built before src/Ubuntu/Test seems reasonable and is sufficient for this (since that in turn depends on src/Ubuntu/UbuntuGestures).

Tested on a porter box with "DEB_BUILD_OPTIONS=parallel=8 dpkg-buildpackage -B -uc -us", which isn't a perfect simulation of the buildd situation since the porter box only has 6 CPUs, but it's a reasonable indicator that this is at least halfway sensible.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Zoltan Balogh (bzoltan) wrote :

Thank you for this fix

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/src.pro'
2--- src/src.pro 2015-11-05 11:00:10 +0000
3+++ src/src.pro 2016-01-06 01:36:34 +0000
4@@ -15,6 +15,7 @@
5
6 src_test.subdir = Ubuntu/Test
7 src_test.target = sub-test
8+src_test.depends = sub-components
9
10 #order is important
11 SUBDIRS += src_gestures src_components src_layouts src_performance_metrics src_test

Subscribers

People subscribed via source and target branches