[SCM] gwenview packaging branch, master, updated. debian/15.12.1-1-20-g5e97be8

[Maximiliano Curia]

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

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

    Update testsuite script
---
 debian/tests/testsuite          | 17 ++++++++---------
 debian/tests/testsuite.xsession |  6 +++---
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 933f7b1..de940ea 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,12 +1,11 @@
 #!/bin/sh
+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
 
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-export HOME="$(pwd)/debian/testsuite.home"
-[ -e "${HOME}" ] || mkdir "${HOME}"
 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
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 1bcedb8..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,6 +1,6 @@
 #!/bin/sh
-
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
 kdeinit5
-trap "kdeinit5_shutdown" EXIT
-
+trap kdeinit5_shutdown EXIT
 dh_auto_test

-- 
gwenview packaging