From 879100eea7dab5b4e95344f99041ba742eb331e0 Mon Sep 17 00:00:00 2001 From: Dalton Durst Date: Sat, 2 May 2020 14:49:46 -0500 Subject: [PATCH] [DO NOT MERGE] Skip tests on ARM The test battery has begun to fail under arm64 and armhf on xenial_-_edge_-_wayland, possibly due to a Mesa issue with xvfb. https://github.com/ubports/unity8/issues/340 --- debian/rules | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/rules b/debian/rules index ab0e554b43..4955f152e8 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,11 @@ include /usr/share/dpkg/default.mk export DPKG_GENSYMBOLS_CHECK_LEVEL=4 export NO_PNG_PKG_MANGLE=1 +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +# Skip tests on the archs they are known to be flaky with current configuration +testskip_architectures := arm64 armhf + %: dh $@ --parallel --fail-missing --with python3 @@ -21,10 +26,12 @@ override_dh_auto_build: dh_auto_build -- -O all doc override_dh_auto_test: +ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures))) # Run the entire test battery # Parallel tests have a risk of starting xvfb on the same DISPLAY multiple times, # causing the whole battery to fail. dh_auto_test --no-parallel -- -O -k xvfballtests +endif override_dh_install: # install autopilot tests