[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.9.0-2-3-g082e48c

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 082e48c40daf23afeb0ad915140b2338331e4d57
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jun 22 18:52:25 2017 +0300

    Run unit tests during build.
---
 debian/changelog |  1 +
 debian/clean     |  1 +
 debian/control   |  4 ++++
 debian/rules     | 11 ++++++++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a0dadee..479a2f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtmultimedia-opensource-src (5.9.0-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Change qtdeclarative5-private-dev dependency to qtdeclarative5-dev.
+  * Run unit tests during build.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 Jun 2017 15:54:19 +0300
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..e72e6b0
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+test_root/
diff --git a/debian/control b/debian/control
index 48e9018..71c4112 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,13 @@ Build-Depends: debhelper (>= 9.20160114~),
                libpulse-dev,
                libqt5opengl5-dev (>= 5.9.0+dfsg~),
                pkg-kde-tools,
+               qml-module-qtquick2,
+               qml-module-qttest,
                qtbase5-dev (>= 5.9.0+dfsg~),
                qtbase5-private-dev (>= 5.9.0+dfsg~),
                qtdeclarative5-dev (>= 5.9.0~),
+               xauth,
+               xvfb,
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.0+dfsg~),
                      qtbase5-doc-html (>= 5.9.0+dfsg~),
diff --git a/debian/rules b/debian/rules
index fb11071..6d2d6f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,20 @@ pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debia
 	dh $@ --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
+override_dh_auto_test-arch:
+	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
+	QT_LOGGING_RULES="default.debug=true" \
+		xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+		dh_auto_test -- -Ctests/auto/unit QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
+
+# Do not attempt to run tests during indep build
+override_dh_auto_test-indep:
+
 override_dh_auto_install-arch:
 	dh_auto_install
 

-- 
qtmultimedia packaging