[SCM] qtquickcontrols packaging branch, experimental, updated. debian/5.6.1-2-13-gc29a8b4

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c29a8b440ca850e80ed409b379a4c1212ab824d7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 12 16:15:55 2016 +0300

    Run tests during build.
    
    - Build with QT_BUILD_PARTS+=tests.
    - Add build-dependencies on various QML modules and Xvfb.
---
 debian/changelog |  3 +++
 debian/control   | 11 ++++++++++-
 debian/rules     |  8 +++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c26667..05bce57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ qtquickcontrols-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * Make qml-module-qtquick-controls depend on qml-module-qtgraphicaleffects.
   * Add a patch to make the Dashboard example use packaged DejaVu Sans font
     (packaged_dejavu_sans.diff).
+  * Run tests during build.
+    - Build with QT_BUILD_PARTS+=tests.
+    - Add build-dependencies on various QML modules and Xvfb.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 28 Jun 2016 14:43:47 +0200
 
diff --git a/debian/control b/debian/control
index f5f6aea..ca28706 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,17 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
+               qml-module-qtgraphicaleffects (>= 5.7.0~),
+               qml-module-qtquick-layouts (>= 5.7.0~),
+               qml-module-qtqml-models2 (>= 5.7.0~),
+               qml-module-qtquick-window2 (>= 5.7.0~),
+               qml-module-qttest (>= 5.7.0~),
+               qml-module-qt-labs-folderlistmodel (>= 5.7.0~),
+               qml-module-qt-labs-settings (>= 5.7.0~),
                qtbase5-private-dev (>= 5.7.0+dfsg~),
-               qtdeclarative5-private-dev (>= 5.7.0~)
+               qtdeclarative5-private-dev (>= 5.7.0~),
+               xauth,
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.0+dfsg~),
                      qtbase5-doc-html (>= 5.7.0+dfsg~),
                      qtdeclarative5-doc-html (>= 5.7.0~),
diff --git a/debian/rules b/debian/rules
index eb236a7..a78bd8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,10 @@ export QT_SELECT := qt5
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc src/controls/controls.qrc src/dialogs/dialogs.qrc
+	rm -rfv test_root
 
 override_dh_auto_configure:
-	qmake
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
@@ -33,5 +34,10 @@ override_dh_auto_install-arch:
 
 override_dh_auto_test-indep:
 
+override_dh_auto_test-arch:
+	$(MAKE) install INSTALL_ROOT=$(CURDIR)/test_root
+	xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+		dh_auto_test -- QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
+
 override_dh_install:
 	dh_install --fail-missing

-- 
qtquickcontrols packaging