[SCM] kwindowsystem packaging branch, master, updated. debian/5.16.0-1-14-g24f5f82

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b87f9ad05ba7f7a93b1803c66530a86be316956f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 11:04:33 2016 +0100

    Move auto_tests back to autopkgtests using xephyr
---
 debian/tests/control   |  2 +-
 debian/tests/testsuite | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 890b2c8..b467d57 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,7 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox, xserver-xephyr
-Restrictions: rw-build-tree
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index b8367a9..c34d8f2 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,15 +1,11 @@
 #!/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
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
-xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
-ret=$?
-rm -rf debian/tests.home
-exit $ret
+mkdir "$HOME"/.config || true
+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 debian/tests/testsuite.xsession

-- 
kwindowsystem packaging