[SCM] qtwebchannel packaging branch, master, updated. 494f008b2cb64f9dc936543f5ba21b7e65768226

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 9e538eee3f04b0d0755c68ac7c661e3da6afa4b5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 27 19:08:34 2016 +0300

    Run QML tests too, drop the patch.
---
 debian/patches/disable_unbuilable_tests.diff | 19 -------------------
 debian/patches/series                        |  1 -
 debian/rules                                 |  6 +++++-
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/debian/patches/disable_unbuilable_tests.diff b/debian/patches/disable_unbuilable_tests.diff
deleted file mode 100644
index 6fdb4f4..0000000
--- a/debian/patches/disable_unbuilable_tests.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable the tests that break the build
- Only a temp patch to not break the build of the package
- and have at least some tests running.
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Last-Update: 2016-07-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
---- a/tests/auto/auto.pro	2016-07-28 14:00:16.000000000 +0200
-+++ b/tests/auto/auto.pro	2016-07-28 14:00:39.063020991 +0200
-@@ -1,7 +1,3 @@
- TEMPLATE = subdirs
- 
--SUBDIRS += cmake webchannel
--
--qtHaveModule(quick) {
--    SUBDIRS += qml
--}
-+SUBDIRS += webchannel
diff --git a/debian/patches/series b/debian/patches/series
index a121b39..a3d4513 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 nodetonodejs.diff
-disable_unbuilable_tests.diff
diff --git a/debian/rules b/debian/rules
index 515810d..6fffe5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export QT_SELECT := qt5
 override_dh_clean:
 	dh_clean
 
-	rm -rf doc
+	rm -rf doc test_root
 	rm -f examples/webchannel/chatclient-html/qwebchannel.js
 	rm -f examples/webchannel/nodejs/qwebchannel.js
 	rm -f examples/webchannel/qwclient/qwebchannel.js
@@ -41,6 +41,10 @@ override_dh_auto_install-arch:
 	ln -sf ../chatclient-html/qwebchannel.js debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/nodejs/qwebchannel.js
 	ln -sf ../chatclient-html/qwebchannel.js debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples/webchannel/qwclient/qwebchannel.js
 
+override_dh_auto_test-arch:
+	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
+	dh_auto_test -- QT_QPA_PLATFORM=minimal QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
+
 override_dh_auto_test-indep:
 
 override_dh_auto_install-indep:

-- 
qtwebchannel packaging