Merge lp:~osomon/webbrowser-app/arm64-skip-tests into lp:webbrowser-app

[Olivier Tilloy]

Temporarily skip tests on arm64 to unblock package build without oxide.

[Tyler Hicks (tyhicks)]

Looks good to me.

review: Approve

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1496
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/554/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/778/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/778
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/722
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/722
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/722
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/714/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/714/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/714
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/714/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/554/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-06-03 08:09:24 +0000
+++ debian/control	2016-06-28 16:36:26 +0000
@@ -9,6 +9,7 @@
                debhelper (>= 9),
                dh-apparmor,
                dh-translations,
+               dpkg-dev,
                libapparmor-dev,
                libevdev-dev,
                liboxideqt-qmlplugin (>= 1.12),

=== modified file 'debian/rules'
--- debian/rules	2016-05-18 09:27:01 +0000
+++ debian/rules	2016-06-28 16:36:26 +0000
@@ -6,6 +6,10 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+# Temporarily skip tests on arm64 to unblock package build without oxide.
+testskip_architectures := arm64
+
 BUILDHOME=/tmp/home
 
 %:
@@ -39,6 +43,10 @@
 	rm -rf $(BUILDHOME)
 
 override_dh_auto_test:
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 	mkdir -p $(BUILDHOME)
 	HOME=$(BUILDHOME) dh_auto_test
+else
+	echo "Temporarily skipping tests on $(DEB_HOST_ARCH)."
+endif