[SCM] kio packaging branch, master, updated. debian/5.19.0-1-17-g43132a4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit bc81856d4890db83db945515d5864e9d9603cae2
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 7 11:24:45 2016 +0200

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

diff --git a/debian/tests/control b/debian/tests/control
index 3524657..81526c3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,7 +2,7 @@ Tests: testsuite
 Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox,
          libkf5service-bin, kded5, kinit
-Restrictions: rw-build-tree
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index b8367a9..0b8e7b3 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,15 +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
-ret=$?
-rm -rf debian/tests.home
-exit $ret
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 3f92f82..869d08f 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -4,7 +4,6 @@ export LC_ALL=C.UTF-8
 openbox &
 sleep 5
 kdeinit5
+trap "kdeinit5_shutdown" EXIT
+sleep 1
 dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret

-- 
kio packaging