[SCM] kate packaging branch, master, updated. debian/15.12.1-1-7-g68d4dbf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2e95ea7e99eb786031f1d7cff6cb19a930e1c41c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 15 12:24:38 2016 +0100

    Improve the testsuite script
---
 debian/tests/testsuite          | 9 ++++++---
 debian/tests/testsuite.xsession | 7 ++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index d8e054c..c78296b 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,9 +1,12 @@
 #!/bin/sh
 
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export HOME=$(mktemp -d)
+
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
 
+trap "kill ${x_pid}; rm -rf ${HOME}" EXIT
+
 DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
-ret=$?
-kill ${x_pid}
-exit $ret
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 5216db9..bd6d774 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,8 +1,5 @@
 #!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
 kdeinit5
+trap "kdeinit5_shutdown" EXIT
+
 dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret

-- 
kate packaging