[SCM] qbs packaging branch, master, updated. debian/1.4.1+dfsg-5-5-geb64ba9

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0be4d5a6f45152cb89958229cca1b076f016def5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 18 18:44:03 2015 +0300

    Move tests whitelist logic to auto.pro.
    
    So that non-API tests are still run on non-whitelisted architectures.
---
 debian/changelog                           |  2 ++
 debian/patches/disable_tests_qtscript.diff | 46 ++++++++++++------------------
 debian/patches/series                      |  1 +
 debian/rules                               |  7 -----
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a654e5d..75e381c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qbs (1.4.1+dfsg-6) UNRELEASED; urgency=medium
   * Simplify testing commands: no need to pass --settings-dir because
     we export XDG_CONFIG_HOME anyway.
   * Define qbs_enable_unit_tests to enable some additional tests.
+  * Move tests whitelist logic to auto.pro, so that non-API tests are
+    still run on non-whitelisted architectures.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jul 2015 18:00:48 +0300
 
diff --git a/debian/patches/disable_tests_qtscript.diff b/debian/patches/disable_tests_qtscript.diff
index d3ce17e..27cdbd4 100644
--- a/debian/patches/disable_tests_qtscript.diff
+++ b/debian/patches/disable_tests_qtscript.diff
@@ -1,4 +1,5 @@
-Description: remove some tests that fail because of QtScript bugs
+Description: limit API tests to only common architectures
+ On other architectures they are segfaulting due to bugs in QtScript.
  The stacktrace is (obtained on ppc64el):
    #0  SLL_PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, head=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:742
    #1  PopRange (end=<synthetic pointer>, start=<synthetic pointer>, N=<optimized out>, this=0x3fffb32004e0) at ../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp:2083
@@ -9,33 +10,24 @@ Description: remove some tests that fail because of QtScript bugs
    #6  0x00003fffb6a489b8 in start_thread (arg=0x3fffb441f160) at pthread_create.c:322
    #7  0x00003fffb745f870 in clone () at ../sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S:104
  .
- QBS is going to be ported away from QtScript, but in the mean time remove
- some tests to make the build pass.
- .
- Currently disabled tests:
-   moc-hpp-included (fails on powerpc, ppc64el, mipsel)
-   infinite-loop-js (fails on powerpc)
+ QBS is going to be ported away from QtScript, but in the mean time disable
+ API tests on non-common architectures to make the build pass.
 Author: Dmitry Shachnev <mitya57 at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-07-12
+Last-Update: 2015-07-18
 
---- a/tests/auto/api/tst_api.cpp
-+++ b/tests/auto/api/tst_api.cpp
-@@ -304,9 +304,6 @@
-     QTest::newRow("Q_OBJECT in header")
-             << QString("moc-hpp")
-             << relativeExecutableFilePath("moc_hpp");
--    QTest::newRow("Q_OBJECT in header, moc_XXX.cpp included")
--            << QString("moc-hpp-included")
--            << relativeExecutableFilePath("moc_hpp_included");
-     QTest::newRow("app and lib with same source file")
-             << QString("lib-same-source")
-             << relativeExecutableFilePath("HelloWorldApp");
-@@ -951,7 +948,6 @@
- void TestApi::infiniteLoopBuilding_data()
- {
-     QTest::addColumn<QString>("projectDirName");
--    QTest::newRow("JS Command") << QString("infinite-loop-js");
-     QTest::newRow("Process Command") << QString("infinite-loop-process");
- }
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -9,5 +9,10 @@
  
+ SUBDIRS += \
+     cmdlineparser \
+-    blackbox \
+-    api
++    blackbox
++
++equals(QT_ARCH, i386) | equals(QT_ARCH, x86_64) | \
++equals(QT_ARCH, arm) | equals(QT_ARCH, arm64) | \
++equals(QT_ARCH, s390x) {
++    SUBDIRS += api
++}
diff --git a/debian/patches/series b/debian/patches/series
index 91537b8..c216b68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ 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 b7dede8..ce64d53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 #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,10 +11,6 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-# 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
 
@@ -55,7 +50,6 @@ 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; \
 		export XDG_CONFIG_HOME=$(CONFIG_DIR); \
@@ -64,7 +58,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(tested_archs)))
 		[ -n "`$(CURDIR)/bin/qbs-config --list profiles.qbs_autotests.baseProfile`" ] || \
 			$(CURDIR)/bin/qbs-config profiles.qbs_autotests.baseProfile gcc; \
 		dh_auto_test
-endif
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qbs packaging