Merge lp:~fginther/ubuntu-touch-boottest/mir-driver-hack into lp:ubuntu-touch-boottest

Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~fginther/ubuntu-touch-boottest/mir-driver-hack
Merge into: lp:ubuntu-touch-boottest
Diff against target: 18 lines (+8/-0)
1 file modified
boottest.sh (+8/-0)
To merge this branch: bzr merge lp:~fginther/ubuntu-touch-boottest/mir-driver-hack
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
Review via email: mp+265760@code.launchpad.net

Commit message

Apply a workaround for mir packages which intentionally do not include explicit dependencies on a necessary driver package.

Description of the change

Apply a workaround for mir packages which intentionally do not include explicit dependencies on a necessary driver package.

Ran some additional tests here:
unity-system-compositor - http://d-jenkins.ubuntu-ci:8080/job/fjg-boottest/65/
ubuntu-keyboard - http://d-jenkins.ubuntu-ci:8080/job/fjg-boottest/66/

https://trello.com/c/8NsWJnSI/255-vanguard-boottest-questions-regarding-unity-system-compositor

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) wrote :

+1, Thanks a lot for taking care of it.

I'd really like to hand this over to the right team before we start hacking for all the packages that'd have similar issues. Having the same archive for all the variants of hw will only lead to more issues whilst our testing is only stuck to specific ones.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'boottest.sh'
2--- boottest.sh 2015-06-29 18:54:43 +0000
3+++ boottest.sh 2015-07-24 02:38:25 +0000
4@@ -167,6 +167,14 @@
5 # will cause adt-run to exit with error code 20).
6 echo '[ $(wc -l needs_install.packages | cut -f 1 -d " ") -eq "0" ] && (echo "ERROR: No packages to install!" > /home/phablet/sourcepkg-version && exit 1)' >> adt-commands
7 echo 'release=$(lsb_release -s -c)' >> adt-commands
8+# XXX 20150723 - fginther - mir driver hacks
9+# Mir packages do not include an explicit dependency on the driver package
10+# (this is intential to avoid what are apparently bigger issues). To workaround
11+# this, include the driver package for specific mir source packages.
12+if [ "${SRC_PKG_NAME}" == "unity-system-compositor" ] || \
13+ [ "${SRC_PKG_NAME}" == "qtmir" ]; then
14+ echo 'echo "mir-graphics-drivers-android" >> needs_install.packages' >> adt-commands
15+fi
16 # Include '-y' in the list of apt-get options because the updated package
17 # under test could pull in new dependencies.
18 echo 'cat needs_install.packages | xargs apt-get install -f -y -t ${release}-proposed 2> apt-get-install.stderr' >> adt-commands

Subscribers

People subscribed via source and target branches