Online Accounts setup for Ubuntu Touch

Merge lp:~mardy/ubuntu-system-settings-online-accounts/restore-arm64 into lp:ubuntu-system-settings-online-accounts

  1. restore-arm64
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Needs review
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/restore-arm64
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 27 lines (+0/-10)
1 file modified
debian/rules (+0/-10)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/restore-arm64
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+301878@code.launchpad.net

Commit message

Revert skipping of arm64 tests

Description of the change

Revert skipping of arm64 tests

To post a comment you must log in.

Unmerged revisions

377. By Alberto Mardegan

Revert skipping of arm64 tests

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 2016-06-10 09:45:56 +0000
3+++ debian/rules 2016-08-03 08:12:07 +0000
4@@ -4,11 +4,6 @@
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@@ -18,11 +13,6 @@
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