[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-32-g2c7d1d2

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=9ffc466

The following commit has been merged in the master branch:
commit 9ffc466c47356f29107b9e7c37a44c6b70a35549
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jul 26 15:10:31 2016 +0200

    Skip test failing on i386 prior Qt 4.7
---
 debian/changelog                                  |  1 +
 debian/patches/series                             |  1 +
 debian/patches/skip-test-failing-prior-qt57.patch | 43 +++++++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 783910c..e0ac754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ gammaray (2.5.0-1) UNRELEASED; urgency=medium
     - debian-archs-fix-build.patch
     - disable-qt4-objectvisualizer.patch
     - disable-qt4-webinspector.patch.
+  * Skip test failing on i386 prior Qt 4.7 (Closes: #826842).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 26 Jul 2016 09:35:26 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 9a7e755..da34771 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+skip-test-failing-prior-qt57.patch
 debian-archs-fix-build.patch
 fix-objectvisualizer-build.patch
 disable-qt4-objectvisualizer.patch
diff --git a/debian/patches/skip-test-failing-prior-qt57.patch b/debian/patches/skip-test-failing-prior-qt57.patch
new file mode 100644
index 0000000..d6efa7d
--- /dev/null
+++ b/debian/patches/skip-test-failing-prior-qt57.patch
@@ -0,0 +1,43 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Tue, 26 Jul 2016 15:03:51 +0200
+Subject: skip-test-failing-prior-qt57
+
+---
+ tests/quickinspectortest.cpp | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/tests/quickinspectortest.cpp b/tests/quickinspectortest.cpp
+index 0e23e3b..7f85b8e 100644
+--- a/tests/quickinspectortest.cpp
++++ b/tests/quickinspectortest.cpp
+@@ -104,6 +104,19 @@ private:
+         return !exposed || waitForSignal(&renderSpy);
+     }
+ 
++    bool checkQtVersion(int major, int minor, int patch)
++    {
++        QStringList parts(QString::fromUtf8(qVersion()).split("."));
++        if (parts.size() != 3) {
++                return false;
++        }
++
++        quint32 version = major << 16 | minor << 8 | patch;
++        quint32 runtimeVersion = parts[0].toInt() << 16 | parts[1].toInt() << 8 | parts[2].toInt();
++
++        return runtimeVersion >= version;
++    }
++
+ private slots:
+     void initTestCase()
+     {
+@@ -228,6 +241,10 @@ private slots:
+ 
+     void testFetchingPreview()
+     {
++        if (!checkQtVersion(5, 7, 0)) {
++            QSKIP("This test is known to fail with Qt < 5.7");
++        }
++
+         auto remoteView
+             = ObjectBroker::object<RemoteViewInterface *>(QStringLiteral(
+                                                               "com.kdab.GammaRay.QuickRemoteView"));

-- 
gammaray packaging