[SCM] qbs packaging branch, master, updated. debian/1.4.5+dfsg-1-2-ge7b26ff

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit e7b26ff112a54bd626d141aa4a94872a4f30dab9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 20 22:48:50 2016 +0100

    Skip new test that hangs on non-x86 architectures.
---
 debian/changelog                         |  2 ++
 debian/patches/series                    |  1 +
 debian/patches/skip_test_concurrent.diff | 15 +++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 42fd14f..e20ed2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.4.5+dfsg-2) UNRELEASED; urgency=medium
 
+  * Skip new TestBlackbox::concurrentExecutor() test which hangs on all
+    non-x86 architectures.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 20 Mar 2016 22:45:53 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 7ee370e..ff017cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ skip_test_homedirectory.diff
 remove_rpaths.diff
 disable_tests_qtscript.diff
 kfreebsd.diff
+skip_test_concurrent.diff
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
new file mode 100644
index 0000000..ebd8771
--- /dev/null
+++ b/debian/patches/skip_test_concurrent.diff
@@ -0,0 +1,15 @@
+Description: skip new test that hangs on non-x86 architectures
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2016-03-20
+
+--- a/tests/auto/blackbox/tst_blackbox.cpp
++++ b/tests/auto/blackbox/tst_blackbox.cpp
+@@ -656,6 +656,7 @@
+ 
+ void TestBlackbox::concurrentExecutor()
+ {
++    QSKIP("hangs on some architectures");
+     QDir::setCurrent(testDataDir + "/concurrent-executor");
+     QCOMPARE(runQbs(QStringList() << "-j" << "2"), 0);
+     QVERIFY2(!m_qbsStderr.contains("ASSERT"), m_qbsStderr.constData());

-- 
qbs packaging