[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.9.1-1-3-g52fc0ec

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=52fc0ec

The following commit has been merged in the experimental branch:
commit 52fc0ec2559d2fbb5f474b403b843ddf459be47f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 18 11:23:53 2017 +0300

    Temporarily ignore the tests results on armhf and mips.
    
    To make the transition possible.
    For MIPS, see https://bugs.debian.org/868745.
---
 debian/changelog | 2 ++
 debian/rules     | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9138912..d191726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtwebsockets-opensource-src (5.9.1-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Run the tests with --max-parallel=1 in hope it will reduce the
     number of test failures.
+  * Temporarily ignore the tests results on armhf (not reproducible on
+    porterbox) and mips (see #868745), to make the transition possible.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Jul 2017 21:54:40 +0300
 
diff --git a/debian/rules b/debian/rules
index c9160d9..13882f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -36,9 +37,10 @@ override_dh_auto_install-arch:
 
 override_dh_auto_test-arch:
 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
-# Disable tests on kfreebsd-*, they are not right.
-# See https://bugreports.qt.io/browse/QTBUG-41448
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+# armhf: illegal instruction, not reproducible on porterbox. See also #860507.
+# mips: related to llvmpipe. Reported as #868745.
+# kfreebsd-*: see https://bugreports.qt.io/browse/QTBUG-41448
+ifneq (,$(filter $(DEB_HOST_ARCH),armhf mips kfreebsd-amd64 kfreebsd-i386))
 	-LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
 		xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
 		dh_auto_test --max-parallel=1 -- -Ctests/auto

-- 
qtwebsockets packaging