[SCM] kde-cli-tools packaging branch, master, updated. debian/5.6.4-1-7-gb7ad1d4

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-cli-tools.git;a=commitdiff;h=ba2f9af

The following commit has been merged in the master branch:
commit ba2f9afe24599cb36bc1e9932bdbd93f26031876
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 3 15:20:09 2016 +0200

    Update testsuite script
---
 debian/tests/control            |  2 +-
 debian/tests/testsuite          |  9 +++++++--
 debian/tests/testsuite.xsession | 17 ++++++++++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 0d3ccaa..e0da704 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, xvfb, xauth, dbus-x11,
-         openbox, libkf5service-bin, kded5, libgl1-mesa-dri
+         openbox, libkf5service-bin, kinit, kded5, libgl1-mesa-dri
 Restrictions: build-needed
 
 # Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fdf2bb0..501d289 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,6 +1,11 @@
 #!/bin/sh
-
-export HOME=$(mktemp -d)
+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+32" \
     dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 9f61d06..db6983a 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,12 +1,19 @@
 #!/bin/sh
-
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
 export XDG_CACHE_HOME="$HOME"
 export XDG_DATA_HOME="${HOME}/.qttest/share"
-mkdir -p ${XDG_DATA_HOME}
+export XDG_RUNTIME_DIR="${HOME}/runtime"
+mkdir -p ${XDG_DATA_HOME} || true
+mkdir -p ${XDG_RUNTIME_DIR} || true
 export XDG_DATA_DIRS="$XDG_DATA_HOME:${HOME}/.local/share:/usr/share"
-openbox &
-sleep 5
-kbuildsycoca5
+openbox & WMPID=$!
+sleep 1
+kdeinit5
+cleanup () {
+    kdeinit5_shutdown
+    if [ -n "$WMPID" ]; then kill "$WMPID"; fi
+}
+trap cleanup EXIT
+kbuildsycoca5 --testmode
 dh_auto_test

-- 
kde-cli-tools packaging