[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.5.1+dfsg-6ubuntu1-4-ge3ec8a2

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=2572b5a

The following commit has been merged in the ubuntu branch:
commit 2572b5a04aa335dfeee21791f970d36096483d78
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Dec 4 10:07:13 2015 +0000

    Switch to opt-in for architectures to run tests on.
---
 debian/changelog | 1 +
 debian/rules     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa58931..e756cf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.5.1+dfsg-6ubuntu2) UNRELEASED; urgency=medium
   * debian/patches/enable-tests.patch:
     - Replace the non-DFSG-free RFC files with public domain content.
   * debian/copyright: mention the replacement.
+  * Switch to opt-in for architectures to run tests on.
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 04 Dec 2015 09:44:17 +0000
 
diff --git a/debian/rules b/debian/rules
index 5b0e803..4296399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,8 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
 	cpu_opt = -no-sse2 -no-pch
 endif
 
-# Skip tests on the archs they are known to be flaky  with current configuration
-testskip_architectures := arm64 powerpc ppc64el
+# Run tests only on archs known to pass in the past
+testrun_architectures := amd64 armhf i386
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
@@ -180,7 +180,7 @@ endif
 	            $(cpu_opt)
 
 override_dh_auto_test:
-ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 		xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib PATH=$(CURDIR)/bin:$(PATH)
 endif

-- 
qtbase packaging