[SCM] qtwebengine packaging branch, master, updated. 00f20029d640454ecc0b7173b8be8bd20af26012

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 00f20029d640454ecc0b7173b8be8bd20af26012
Author: Sandro Knauß <hefee at debian.org>
Date:   Mon Oct 31 16:34:54 2016 +0100

    Run tests, but make them not-fatal
---
 debian/control |  5 ++++-
 debian/rules   | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 6e614d3..8a86e44 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends: autotools-dev,
                libcap-dev [linux-any],
                libdbus-1-dev,
                libegl1-mesa-dev,
+               libgl1-mesa-dri,
                libevent-dev,
                libflac-dev,
                libfontconfig1-dev,
@@ -70,7 +71,9 @@ Build-Depends: autotools-dev,
                qtlocation5-dev,
                qtscript5-private-dev (>= 5.7.1~20161021~),
                re2c,
-               ruby
+               ruby,
+               xauth,
+               xvfb
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.7.1~20161021~),
                      qtbase5-doc-html (>= 5.7.1~20161021~),
                      qttools5-dev-tools (>= 5.7.1~20161021~)
diff --git a/debian/rules b/debian/rules
index c1fbf0b..f8a936f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,10 +50,16 @@ replace_gyp_args = $(foreach define,$(defines),-D$(define))
 %:
 	dh $@ --with pkgkde_symbolshelper
 
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/test_root
+	rm -rf $(CURDIR)/docs
+	rm -rf $(CURDIR)/.local
+
 override_dh_auto_configure:
 	src/3rdparty/chromium/build/linux/unbundle/replace_gyp_files.py $(replace_gyp_args)
 	# Run qmake once to create .qmake.conf and be sure to append the following values.
-	qmake WEBENGINE_CONFIG+="$(defines)"
+	qmake WEBENGINE_CONFIG+="$(defines)" QT_BUILD_PARTS+=" tests"
 
 # Enable gstabs debugging symbols only on gstab_architectures.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
@@ -84,13 +90,12 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectur
 endif
 
 	# Run qmake again now with the proper values.
-	qmake  WEBENGINE_CONFIG+="$(defines)"
+	qmake  WEBENGINE_CONFIG+="$(defines)" QT_BUILD_PARTS+=" tests"
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
 override_dh_auto_install-arch:
-	#make install INSTALL_ROOT=$(CURDIR)/debian/tmp
 	dh_auto_install
 	
 	# Remove rpath from the offending binaries
@@ -126,5 +131,14 @@ override_dh_link:
 	
 	dh_link --remaining-packages
 
-#override_dh_auto_test-indep:
+override_dh_auto_test-arch:
+	$(MAKE) install -Csrc/core INSTALL_ROOT=$(CURDIR)/test_root
+	-xvfb-run -a \
+		-s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
+		dh_auto_test --no-parallel -- -k \
+		QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
+		LD_LIBRARY_PATH=$(CURDIR)/lib \
+		HOME=$(CURDIR)
+
+override_dh_auto_test-indep:
 	# Do not attempt to run anything to make build-indep work

-- 
qtwebengine packaging