[SCM] khtml packaging branch, kubuntu_vivid_archive, updated. b427f31ac388c39f80fe4a18cc062f97a7ec9477

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=477d18f

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 477d18f40d387697995bf1a6551e127d5e8bfd6b
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 6 21:58:14 2014 +0100

    convert testing to autopkgtest
---
 debian/control                  |  1 +
 debian/rules                    |  3 +--
 debian/tests/control            |  4 ++++
 debian/tests/testsuite          | 10 ++++++++++
 debian/tests/testsuite.xsession |  9 +++++++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index df0f9d5..32b4c57 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,7 @@ Build-Depends: cmake,
                zlib1g-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/frameworks/khtml
+XS-Testsuite: autopkgtest
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/frameworks/khtml.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/khtml.git
 
diff --git a/debian/rules b/debian/rules
index 2d52223..13dbf11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,4 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5khtml5-dbg
 
-override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..e7fde3c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11, openbox
+Restrictions: rw-build-tree
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100644
index 0000000..00220b9
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -d /usr/lib/ccache ]; then
+    export PATH="/usr/lib/ccache:$PATH"
+fi
+debian/rules clean 2>&1
+dpkg-source --before-build .
+debian/rules build 2>&1
+xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..2e3085c
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,9 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+[ -e debian/tests.home ] || mkdir debian/tests.home
+HOME=debian/tests.home openbox &
+sleep 5
+HOME=debian/tests.home dh_auto_test
+rm -rf debian/home/tests.home
+

-- 
khtml packaging