[SCM] purpose packaging branch, master, updated. 5d880e1f317ddc7c3ac1adea01cb05c5fddf9edf

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/purpose.git;a=commitdiff;h=3ab8583

The following commit has been merged in the master branch:
commit 3ab8583c9a4e5fc64812c6dc34bdb3a2fa0ffe91
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 11 17:14:57 2016 +0200

    import test rigging from kio
    
    kio uses most runtime magic, so this should help make the tests
    pass. also don't do stuff after dh_auto_test to break the return
    value :O (always was a pass before because of the rm...)
---
 debian/tests/testsuite          | 10 ++++------
 debian/tests/testsuite.xsession | 11 +++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..0b8e7b3 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-if [ -d /usr/lib/ccache ]; then
-    export PATH="/usr/lib/ccache:$PATH"
-fi
-debian/rules clean 2>&1
-dpkg-source --before-build .
-debian/rules build 2>&1
+[ -e debian/tests.home ] || mkdir debian/tests.home
+trap "rm -rf debian/tests.home" EXIT
+export HOME="$(pwd)/debian/tests.home"
+
 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 3a00834..869d08f 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,10 +1,9 @@
 #!/bin/sh
-#!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-[ -e debian/tests.home ] || mkdir debian/tests.home
-HOME=debian/tests.home openbox &
+openbox &
 sleep 5
-HOME=debian/tests.home dh_auto_test
-rm -rf debian/home/tests.home
-
+kdeinit5
+trap "kdeinit5_shutdown" EXIT
+sleep 1
+dh_auto_test

-- 
purpose packaging