[SCM] libkdeedu packaging branch, master, updated. debian/14.12.2-1-15-g2a497e0

[Maximiliano Curia]

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

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

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

diff --git a/debian/tests/control b/debian/tests/control
index af6cefd..e0e44bc 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11
+         xvfb, xauth, dbus-x11, kinit
 Restrictions: rw-build-tree
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 60d997a..de940ea 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +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
+
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index bd1c9db..98ca5e6 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,5 +1,6 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-kdeinit4
+kdeinit5
+trap kdeinit5_shutdown EXIT
 dh_auto_test

-- 
libkdeedu packaging