[SCM] qbs packaging branch, master, updated. debian/1.3.3+dfsg-2-7-g09ff62e

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 73abc48c2de617b5b7ba8c2ec3d156b2cc0f6a19
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 9 19:34:21 2015 +0300

    Add increase_timeout.diff from Dejan Latinovic to make tests pass on mips.
---
 debian/changelog                     |  4 ++++
 debian/patches/increase_timeout.diff | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcce35f..1aea80a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ qbs (1.3.3+dfsg-3) UNRELEASED; urgency=medium
     software. On Debian, rpath should not be set when referencing
     system installed libraries.
 
+  [ Dmitry Shachnev ]
+  * Add increase_timeout.diff from Dejan Latinovic to make tests pass
+    on mips.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 31 Dec 2014 16:52:15 +0100
 
 qbs (1.3.3+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/increase_timeout.diff b/debian/patches/increase_timeout.diff
new file mode 100644
index 0000000..ea545ad
--- /dev/null
+++ b/debian/patches/increase_timeout.diff
@@ -0,0 +1,36 @@
+Description: increase tests timeout to make them succeed on mips
+Author: Dejan Latinovic <Dejan.Latinovic at imgtec.com>
+Forwarded: not-yet
+Last-Update: 2015-01-09
+
+--- a/tests/auto/api/tst_api.cpp
++++ b/tests/auto/api/tst_api.cpp
+@@ -576,7 +576,7 @@
+     qbs::Project project = setupJob->project();
+     const QScopedPointer<qbs::BuildJob> buildJob(project.buildAllProducts(qbs::BuildOptions()));
+     QTimer::singleShot(1000, buildJob.data(), SLOT(cancel()));
+-    QVERIFY(waitForFinished(buildJob.data(), 300000));
++    QVERIFY(waitForFinished(buildJob.data(), 600000));
+ }
+ 
+ void TestApi::infiniteLoopBuilding_data()
+@@ -595,7 +595,7 @@
+     QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams,
+                                                                               m_logSink, 0));
+     QTimer::singleShot(1000, setupJob.data(), SLOT(cancel()));
+-    QVERIFY(waitForFinished(setupJob.data(), 300000));
++    QVERIFY(waitForFinished(setupJob.data(), 600000));
+     QVERIFY2(setupJob->error().toString().toLower().contains("cancel"),
+              qPrintable(setupJob->error().toString()));
+ }
+--- a/tests/auto/blackbox/tst_blackbox.cpp
++++ b/tests/auto/blackbox/tst_blackbox.cpp
+@@ -106,7 +106,7 @@
+     QProcess process;
+     process.setProcessEnvironment(params.environment);
+     process.start(cmdLine);
+-    const int waitTime = 5 * 60000;
++    const int waitTime = 10 * 60000;
+     if (!process.waitForStarted() || !process.waitForFinished(waitTime)) {
+         m_qbsStderr = process.readAllStandardError();
+         if (!params.expectFailure)
diff --git a/debian/patches/series b/debian/patches/series
index 0695402..ffe61d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 endianness.diff
 skip_test.diff
 remove_rpaths.diff
+increase_timeout.diff

-- 
qbs packaging