[SCM] kimageformats packaging branch, master, updated. debian/5.19.0-1-21-g62f7205

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 13ff86c46f4852efcea5d4ea0df3fd3a4de02763
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 19:27:04 2016 +0200

    Drop Xephyr hack
---
 debian/tests/testsuite          | 10 +++++-----
 debian/tests/testsuite.xsession |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c7e77d6..c49c862 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,8 +1,8 @@
 #!/bin/sh
 
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
+mkdir -p "$HOME"/.config || true
+trap "rm -rf debian/tests.home" EXIT
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-trap "kill ${x_pid}" EXIT
-
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 5216db9..35976a5 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,8 +1,4 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-kdeinit5
 dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret

-- 
kimageformats packaging