Merge lp:~osomon/ubuntu-download-manager/fix-ut-sbuild into lp:ubuntu-download-manager

Proposed by Olivier Tilloy
Status: Merged
Approved by: Michael Sheldon
Approved revision: 361
Merged at revision: 361
Proposed branch: lp:~osomon/ubuntu-download-manager/fix-ut-sbuild
Merge into: lp:ubuntu-download-manager
Diff against target: 23 lines (+10/-0)
1 file modified
debian/rules (+10/-0)
To merge this branch: bzr merge lp:~osomon/ubuntu-download-manager/fix-ut-sbuild
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Michael Sheldon (community) Approve
system-apps-ci-bot continuous-integration Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+297613@code.launchpad.net

Commit message

Fix unit tests when run under an sbuild chroot.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:361
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/629
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/82
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/629
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/598
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/598
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/591/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/591/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/591/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/591/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/591/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/591
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/591/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-download-manager-ci/2/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good to me

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

Great

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2014-10-14 15:26:46 +0000
3+++ debian/rules 2016-06-16 10:19:36 +0000
4@@ -23,9 +23,19 @@
5 export DEB_BUILD_MAINT_OPTIONS := hardening=+pie
6 endif
7
8+BUILDHOME=$(CURDIR)/debian/build
9+
10+override_dh_clean:
11+ dh_clean
12+ rm -rf $(BUILDHOME)
13+
14 override_dh_auto_configure:
15 dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
16
17+override_dh_auto_test:
18+ mkdir -p $(BUILDHOME)
19+ HOME=$(BUILDHOME) dh_auto_test
20+
21 dh_auto_install:
22 rm -f debian/tmp/usr/lib/*.so
23 dh_install --fail-missing

Subscribers

People subscribed via source and target branches