Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/arm64tests-1585942 into lp:ubuntu-system-settings-online-accounts

  1. arm64tests-1585942
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 353
Merged at revision: 358
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/arm64tests-1585942
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 27 lines (+10/-0)
1 file modified
debian/rules (+10/-0)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/arm64tests-1585942
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Online Accounts Pending
Review via email: mp+296542@code.launchpad.net

Commit message

Skip tests on arm64

Description of the change

Skip tests on arm64

To post a comment you must log in.

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-11-26 15:56:08 +0000
3+++ debian/rules 2016-06-06 12:08:51 +0000
4@@ -4,6 +4,11 @@
5 # Uncomment this to turn on verbose mode.
6 #export DH_VERBOSE=1
7
8+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
9+
10+# Skip tests on the archs they are known to be flaky with current configuration
11+testskip_architectures := arm64
12+
13 override_dh_auto_configure:
14 dh_auto_configure -- \
15 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
16@@ -13,6 +18,11 @@
17 CONFIG+=ubuntu-docs \
18 ubuntu-system-settings-online-accounts.pro
19
20+override_dh_auto_test:
21+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
22+ dh_auto_test
23+endif
24+
25 override_dh_install:
26 rm -rf debian/*/usr/share/accounts/qml-plugins/example
27 rm -rf debian/*/usr/share/accounts/providers/example.provider

Subscribers

People subscribed via source and target branches