[SCM] kwidgetsaddons packaging branch, master, updated. debian/5.16.0-1-12-g29746f6

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwidgetsaddons.git;a=commitdiff;h=29746f6

The following commit has been merged in the master branch:
commit 29746f66ddc833035d27bb0dbd45cbce4a8b45d2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 15:26:05 2016 +0100

    Move auto_tests back to autopkgtests using xephyr
---
 debian/control         |  4 +---
 debian/rules           |  7 ++-----
 debian/tests/control   |  6 +++---
 debian/tests/testsuite | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index ff00d77..5dedf4c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,7 @@ Build-Depends: cmake (>= 2.8.12),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),
                qttools5-dev (>= 5.4),
-               qttools5-dev-tools (>= 5.4),
-               xauth,
-               xvfb
+               qttools5-dev-tools (>= 5.4)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/frameworks/kwidgetsaddons
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kwidgetsaddons.git
diff --git a/debian/rules b/debian/rules
index 799dc37..5d12597 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,5 @@ override_dh_strip:
 	$(overridden_command) --ddeb-migration='libkf5widgetsaddons5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	# Disable the unittests in arm, the unittests need a working display
-	# and xvfb seems to be insufficient.
-	if [ 'arm64' != "$(DEB_HOST_ARCH)" -a 'armel' != "$(DEB_HOST_ARCH)" -a 'armhf' != "$(DEB_HOST_ARCH)" ]; then \
-	    xvfb-run -s '-screen 0 800x600x24' -a $(overridden_command); \
-	fi
+	# Disable the unittests at build time.
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 541be7d..bdd3d8f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
+Tests: testsuite
+Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, xserver-xephyr
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 84eb3d3..b812e39 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,14 @@
 #!/bin/sh
 
-xvfb-run -s '-screen 0 800x600x24' -a dh_auto_test
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
+mkdir "$HOME"/.config || true
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "kill ${x_pid}; rm -rf debian/tests.home" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
kwidgetsaddons packaging