[SCM] kio packaging branch, master, updated. 552adf213029efd058f860cd200b3194cfd59258

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=20167e5

The following commit has been merged in the master branch:
commit 20167e5ce3324f05d0f7efea7ab35ae03eb27f40
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 13 22:58:57 2015 +0100

    testsuite test, dbus services need the use the same HOME.
---
 debian/tests/control            | 3 ++-
 debian/tests/testsuite          | 5 +++++
 debian/tests/testsuite.xsession | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 744fce7..3cdf7ad 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
+         xvfb, xauth, dbus-x11, openbox,
+         libkf5service-bin, kinit
 Restrictions: rw-build-tree
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..b8367a9 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -6,5 +6,10 @@ fi
 debian/rules clean 2>&1
 dpkg-source --before-build .
 debian/rules build 2>&1
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
 xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
     dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+rm -rf debian/tests.home
+exit $ret
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 626cf92..3f92f82 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,10 +1,10 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-[ -e debian/tests.home ] || mkdir debian/tests.home
-HOME="$(pwd)/debian/tests.home" openbox &
+openbox &
 sleep 5
-HOME="$(pwd)/debian/tests.home" dh_auto_test
+kdeinit5
+dh_auto_test
 ret=$?
-rm -rf debian/tests.home
+kdeinit5_shutdown
 exit $ret

-- 
kio packaging