[SCM] konsole packaging branch, master, updated. debian/15.12.1-1-19-ge687667

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/konsole.git;a=commitdiff;h=dc09d1c

The following commit has been merged in the master branch:
commit dc09d1c20eae8f593f9fc58f2ba01d288ce70cb4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue May 10 11:34:46 2016 +0200

    Update testsuite
---
 debian/tests/testsuite          | 16 ++++++++--------
 debian/tests/testsuite.xsession |  4 +---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 6fa0761..de940ea 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,11 +1,11 @@
 #!/bin/sh
-
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
+if [ -z "$HOME" ] || [ ! -d "$HOME" ]; then
+    [ -e debian/tests.home ] || mkdir debian/tests.home
+    export HOME="$(pwd)/debian/tests.home"
+    trap "rm -rf debian/tests.home" EXIT
+fi
+mkdir -p "$HOME"/.config || true
+mkdir -p "$HOME"/.kde-unit-test || true
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-trap "kdeinit5_shutdown; kill ${x_pid}" EXIT
-DISPLAY=:2 kdeinit5
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 5216db9..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -2,7 +2,5 @@
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 kdeinit5
+trap kdeinit5_shutdown EXIT
 dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret

-- 
konsole packaging