[SCM] qtwebsockets packaging branch, experimental, updated. debian/5.9.0-1-3-g46d3b77

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 46d3b77540d3fe16087fabdbce1824db03aeeb35
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 2 17:05:25 2017 +0300

    Run QML tests during build, drop disable_qml_tests.patch.
---
 debian/changelog                       |  1 +
 debian/control                         |  6 +++++-
 debian/patches/disable_qml_tests.patch | 14 --------------
 debian/patches/series                  |  1 -
 debian/rules                           | 11 ++++++++---
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87f34b3..47880a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtwebsockets-opensource-src (5.9.1-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream patch release.
   * Bump Qt build-dependencies to 5.9.1.
+  * Run QML tests during build, drop disable_qml_tests.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 02 Jul 2017 16:18:07 +0300
 
diff --git a/debian/control b/debian/control
index 8aa36cf..c51e44a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,13 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: debhelper (>= 9.20160114~),
                libssl1.0-dev,
                pkg-kde-tools,
+               qml-module-qtquick2,
+               qml-module-qttest,
                qtbase5-private-dev (>= 5.9.1+dfsg~),
                qtdeclarative5-dev (>= 5.9.1~),
-               qtdeclarative5-private-dev (>= 5.9.1~)
+               qtdeclarative5-private-dev (>= 5.9.1~),
+               xauth,
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.1+dfsg~),
                      qtbase5-doc-html (>= 5.9.1+dfsg~),
                      qttools5-dev-tools (>= 5.9.1~)
diff --git a/debian/patches/disable_qml_tests.patch b/debian/patches/disable_qml_tests.patch
deleted file mode 100644
index e01c178..0000000
--- a/debian/patches/disable_qml_tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: do not run QML tests, to avoid dependency on Xvfb
-Author: Timo Jyrinki <timo at debian.org>
-Forwarded: not-needed
-Last-Update: 2015-08-27
-
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -2,6 +2,3 @@ TEMPLATE = subdirs
- 
- SUBDIRS += cmake websockets
- 
--qtHaveModule(quick) {
--    SUBDIRS += qml
--}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 02c4e42..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable_qml_tests.patch
diff --git a/debian/rules b/debian/rules
index bf6899d..b0d6a46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export QT_SELECT := qt5
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rfv doc lib mkspecs
+	rm -rfv doc lib mkspecs test_root
 	rm -fv include/QtWebSockets/QtWebSocketsDepends
 
 override_dh_auto_configure:
@@ -34,11 +34,16 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+override_dh_auto_test-arch:
+	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 # Disable tests on kfreebsd-*, they are not right.
 # See https://bugreports.qt.io/browse/QTBUG-41448
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-override_dh_auto_test-arch:
-	-dh_auto_test
+	-LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
+		xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" dh_auto_test -- -Ctests/auto
+else
+	LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
+		xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" dh_auto_test -- -Ctests/auto
 endif
 
 # Do not run tests during arch-indep build

-- 
qtwebsockets packaging