[SCM] qtlocation packaging branch, experimental, updated. debian/5.9.0+dfsg-2-7-ge443bac

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9e66bbaef02bf5045d130583ea6f86c25970215c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 3 18:46:27 2017 +0300

    Run all tests in Xvfb, drop disable_failing_tests.patch.
---
 debian/changelog                           |  2 ++
 debian/control                             |  6 ++--
 debian/patches/disable_failing_tests.patch | 52 ------------------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  9 +++++-
 5 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae3ee95..6b12c1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtlocation-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * Drop the transitional packages. They are already transitional in
     the current Debian stable and Ubuntu LTS releases.
   * Update libqt5location5.symbols from the current build log.
+  * Run all tests in Xvfb, drop disable_failing_tests.patch.
+    - Add build-dependencies on xauth, xvfb and qml-module-qttest.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Jul 2017 22:10:54 +0300
 
diff --git a/debian/control b/debian/control
index 6b58cd6..f9c29e7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,15 @@ Uploaders: Timo Jyrinki <timo at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>,
            Simon Quigley <tsimonq2 at ubuntu.com>
-Build-Depends: dbus,
-               debhelper (>= 9.20160114~),
+Build-Depends: debhelper (>= 9.20160114~),
                libicu-dev,
                libqt5opengl5-dev (>= 5.9.1+dfsg~),
                pkg-kde-tools,
+               qml-module-qttest (>= 5.9.1~),
                qtbase5-private-dev (>= 5.9.1+dfsg~),
                qtdeclarative5-private-dev (>= 5.9.1~),
+               xauth,
+               xvfb,
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.1+dfsg~),
                      qtbase5-doc-html (>= 5.9.1+dfsg~),
diff --git a/debian/patches/disable_failing_tests.patch b/debian/patches/disable_failing_tests.patch
deleted file mode 100644
index 911953c..0000000
--- a/debian/patches/disable_failing_tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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: 2016-07-14
-
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -25,12 +25,11 @@
-            qplacesearchsuggestionreply \
-            qplaceuser \
-            qplacemanager \
--           qplacemanager_nokia \
-            qplacemanager_unsupported \
-            placesplugin_unsupported
- 
-     #misc tests
--    SUBDIRS +=  qmlinterface \
-+    SUBDIRS += \
-            cmake \
-            doublevectors
- 
-@@ -54,18 +53,8 @@
-            qgeotilespec \
-            qgeoroutexmlparser \
-            maptype \
--           nokia_services \
-            qgeocameratiles
- 
--    qtHaveModule(quick) {
--        SUBDIRS += declarative_core \
--                declarative_geoshape
--
--        !mac: SUBDIRS += declarative_ui
--
--        # QTBUG-60268
--        boot2qt: SUBDIRS -= declarative_ui
--    }
- }
- 
- 
-@@ -81,7 +70,5 @@
-            qgeocoordinate \
-            qgeolocation \
-            qgeopositioninfo \
--           qgeopositioninfosource \
-            qgeosatelliteinfo \
--           qgeosatelliteinfosource \
-            qnmeapositioninfosource
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 726d5ba..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable_failing_tests.patch
diff --git a/debian/rules b/debian/rules
index e3b4f4f..aa2cbba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
@@ -44,8 +46,11 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_auto_test-arch:
+	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 	# Disable tests for the migration,we have a couple of flaky ones on mips*.
-	-dbus-run-session -- dh_auto_test -- QT_QPA_PLATFORM=minimal
+	-xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+		dh_auto_test -- -Ctests/auto HOME=$(CURDIR)/test_home QT_LOGGING_RULES="default.debug=true" \
+		QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
 
 override_dh_auto_test-indep:
 
@@ -66,6 +71,8 @@ override_dh_auto_clean:
 	# Some other leftover binaries
 	rm -fv config.tests/geoclue/geoclue
 
+	rm -rf test_root test_home
+
 override_dh_strip:
 	dh_strip --dbgsym-migration='qtlocation5-dbg (<< 5.7.0-1~), qtpositioning5-dbg (<< 5.5.0-1~)'
 

-- 
qtlocation packaging