[SCM] qtlocation packaging branch, experimental, updated. debian/5.3.0-1-8-ga02cb62

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit a02cb62a1e9940ddbcbc6bf8d0a5e0e049229465
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Jun 7 11:17:15 2014 -0300

    Reenable tests, but disabling the failing ones.
    
    See patch for reasons.
---
 debian/changelog                           |  4 +++-
 debian/patches/disable_failing_tests.patch | 23 +++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               | 10 +++++-----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 212a7a9..ecb460f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 qtlocation-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Keep tests disabled. We still can't find why one of them is failing.
+  * Reenable tests, using disable_failing_tests.patch to disable the tests
+    that are currently failing. Both of them seems to lack a source of
+    information to properly work.
   * Add build dependencies needed for running the tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 23:42:03 -0300
diff --git a/debian/patches/disable_failing_tests.patch b/debian/patches/disable_failing_tests.patch
new file mode 100644
index 0000000..a178ae6
--- /dev/null
+++ b/debian/patches/disable_failing_tests.patch
@@ -0,0 +1,23 @@
+Description: disable failing tests
+ This tests seems to need a source of information to properly work.
+ So far I couldn't understand how to add that source or if it is possible at
+ all.
+ Disable them until we can work it out.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-06-07
+
+---
+ tests/auto/auto.pro |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -76,7 +76,5 @@ SUBDIRS += \
+            qgeocoordinate \
+            qgeolocation \
+            qgeopositioninfo \
+-           qgeopositioninfosource \
+            qgeosatelliteinfo \
+-           qgeosatelliteinfosource \
+            qnmeapositioninfosource
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..726d5ba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_failing_tests.patch
diff --git a/debian/rules b/debian/rules
index 9c35881..7316fc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export QT_SELECT := qt5
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtpositioning5-dbg
 
 override_dh_auto_configure:
-	qmake #QT_BUILD_PARTS+=tests
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-arch:
 	# This override may seem futile, but it helps us make sure that the tools
@@ -46,10 +46,10 @@ override_dh_auto_install-indep:
 override_dh_install:
 	dh_install --fail-missing
 
-#override_dh_auto_test:
-#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-#	xvfb-run -a dbus-launch --exit-with-session dh_auto_test -- QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
-#endif
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	xvfb-run -a dbus-launch --exit-with-session dh_auto_test -- QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
qtlocation packaging