ubuntuone-credentials

Merge lp:~dobey/ubuntuone-credentials/ppc-test-disable into lp:ubuntuone-credentials

  1. ppc-test-disable
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 233
Merged at revision: 231
Proposed branch: lp:~dobey/ubuntuone-credentials/ppc-test-disable
Merge into: lp:ubuntuone-credentials
Diff against target: 16 lines (+5/-1)
1 file modified
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-credentials/ppc-test-disable
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Review via email: mp+289957@code.launchpad.net

Commit message

Disable tests on powerpc as something in xenial is causing a crash.

To post a comment you must log in.
lp:~dobey/ubuntuone-credentials/ppc-test-disable updated
231. By dobey

Spaces not tabs needed here.

232. By dobey

Fix a typo.

Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks good.

Revision history for this message
Alejandro J. Cura (alecu) :
review: Approve
lp:~dobey/ubuntuone-credentials/ppc-test-disable updated
233. By dobey

Need a space here?

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 2015-01-15 11:29:50 +0000
3+++ debian/rules 2016-03-23 19:30:00 +0000
4@@ -3,7 +3,11 @@
5 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
6 DH_CMAKE_BUILD_DIR=obj-${DEB_BUILD_GNU_TYPE}
7 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
8-DEB_HOST_ARCH ?= $(shell dpk-architecture -qDEB_HOST_ARCH)
9+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
10+
11+ifneq (,$(filter $(DEB_HOST_ARCH), powerpc))
12+ DEB_BUILD_OPTIONS := nocheck $(DEB_BUILD_OPTIONS)
13+endif
14
15
16 %:

Subscribers

People subscribed via source and target branches

to all changes: