[SCM] kemoticons packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g9b74b0b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 9e09b9f0746de18118821801173ba9e531583189
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 20 22:45:36 2015 +0100

    Update testsuite
---
 debian/tests/control            |  6 +++---
 debian/tests/testsuite          | 11 +++++------
 debian/tests/testsuite.xsession |  5 ++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 786ed42..bfc188b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,8 +1,8 @@
 Tests: testsuite
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, openbox,
-         kded5
-Restrictions: rw-build-tree
+         kded5, kinit
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..5474448 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,9 @@
 #!/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
+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 c849da6..3f92f82 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,11 +1,10 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-[ -e debian/tests.home ] || mkdir debian/tests.home
-export HOME="$(pwd)/debian/tests.home"
 openbox &
 sleep 5
+kdeinit5
 dh_auto_test
 ret=$?
-rm -rf debian/tests.home
+kdeinit5_shutdown
 exit $ret

-- 
kemoticons packaging