[SCM] qt5webkit packaging branch, experimental, updated. debian/5.212.0_alpha2-1

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 35a93dd425cd6b62c46eb8bb2e9ba5bd4cb0b943
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Aug 28 11:43:00 2017 +0300

    Run upstream tests during build.
---
 debian/changelog | 1 +
 debian/control   | 4 +++-
 debian/rules     | 9 ++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a30f604..500c51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ qtwebkit-opensource-src (5.212.0~alpha2-1) UNRELEASED; urgency=medium
   * Add a patch to properly detect whether OpenGL ES 2 should be used.
   * Disable the use of gold linker (causes problems at least on i386).
   * Remove i386 from gstabs_architectures, add ppc64el.
+  * Run upstream tests during build.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Aug 2017 20:50:49 +0300
 
diff --git a/debian/control b/debian/control
index 00b5b80..55cb842 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,9 @@ Build-Depends: bison,
                qtbase5-private-dev (>= 5.9.1+dfsg-9~),
                qtdeclarative5-private-dev (>= 5.9.1~),
                qtpositioning5-dev (>= 5.9.1+dfsg~),
-               ruby
+               ruby,
+               xauth <!nocheck>,
+               xvfb <!nocheck>
 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/rules b/debian/rules
index 4ec8759..d791fbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,14 @@ override_dh_auto_install-indep:
 override_dh_missing:
 	dh_missing --fail-missing
 
-override_dh_auto_test:
+override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	-cd obj-$(DEB_HOST_GNU_TYPE); \
+	xvfb-run -a -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+	ctest --output-on-failure
+endif
+
+override_dh_auto_test-indep:
 	# Do not attempt to run anything to make build-indep work
 
 override_dh_strip:

-- 
qt5webkit packaging