[SCM] qbs packaging branch, experimental, updated. debian/1.4.1+dfsg-3-7-g06c2d75

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=06c2d75

The following commit has been merged in the experimental branch:
commit 06c2d75964daa433137b23a9c6de96fdff1b23b5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 13 13:18:41 2015 +0300

    Use a whitelist of architectures where we run tests.
    
    Until QBS gets ported away from QtScript.
---
 debian/changelog      | 2 ++
 debian/patches/series | 1 -
 debian/rules          | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2c432b2..4c7dd35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qbs (1.4.1+dfsg-5) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Fixup the previous kFreeBSD fix; add B-D on libutil-freebsd-dev.
+  * Use a whitelist of architectures where we run tests, until QBS
+    gets ported away from QtScript.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 13 Jul 2015 12:42:36 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index c216b68..91537b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ skip_test.diff
 remove_rpaths.diff
 revert_tests_speedup.diff
 fix_assembly_test.diff
-disable_tests_qtscript.diff
 bsd_includes.diff
diff --git a/debian/rules b/debian/rules
index 6c75224..731df5e 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_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 CONFIG_DIR = $(CURDIR)/debian/config
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -12,6 +13,10 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 export XDG_CONFIG_HOME := $(CONFIG_DIR)
 
+# On other archs there are random segfaults in QtScript code.
+# We will enable the tests everywhere when QBS gets ported away from QtScript.
+tested_archs = amd64 arm64 armel armhf i386 mips s390x
+
 %:
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qbs-dbg
 
@@ -50,6 +55,7 @@ override_dh_auto_install-arch:
 
 override_dh_auto_test:
 	mkdir -p $(CONFIG_DIR)/QtProject
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(tested_archs)))
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
 		$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject; \
@@ -57,6 +63,7 @@ override_dh_auto_test:
 		[ -n "`$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject --list profiles.qbs_autotests.baseProfile`" ] || \
 			$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject profiles.qbs_autotests.baseProfile gcc; \
 		dh_auto_test
+endif
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qbs packaging