[SCM] qtwebsockets packaging branch, master, updated. debian/5.3.2-4-5-g3436d29

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 5ed1d55825c107f2f1aa76603069445d6f936808
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Sep 24 00:25:58 2014 -0300

    Disable tests on kfreebsd-*, we now they are not right.
---
 debian/changelog |  4 ++++
 debian/rules     | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f902a82..c929f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtwebsockets-opensource-src (5.3.2-5) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Disable tests on kfreebsd-*, we now they are not right. See
+    https://bugreports.qt-project.org/browse/QTBUG-41448 for more info.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Sep 2014 00:18:12 -0300
 
 qtwebsockets-opensource-src (5.3.2-4) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 694080d..5aa804b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
+disable_test_architecures := kfreebsd-i386 kfreebsd-amd64
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtwebsockets5-dbg
 
@@ -38,6 +40,14 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+# Disable tests on kfreebsd-*, they are not right.
+# See https://bugreports.qt-project.org/browse/QTBUG-41448
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disable_test_architecures)))
+override_dh_auto_test:
+	echo "Tests disabled on kfreebsd-*, \
+	see https://bugreports.qt-project.org/browse/QTBUG-41448"
+endif
+
 override_dh_auto_install-indep:
 	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 

-- 
qtwebsockets packaging