[SCM] akonadi-search packaging branch, master, updated. debian/15.08.3-1-14-g06b15d9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-search.git;a=commitdiff;h=06b15d9

The following commit has been merged in the master branch:
commit 06b15d9988f6b28919d8ab5a3775562aed5d4954
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Feb 11 15:50:57 2016 +0100

    Hacky use of xephyr
---
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 0adeae1..f4a666d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         dbus-x11, xvfb, xauth, akonadi-backend-sqlite
+         dbus-x11, xvfb, xauth, akonadi-backend-sqlite, xserver-xephyr
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c959362..6bf8085 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,9 @@
 #!/bin/sh
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session dh_auto_test
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+ret=$?
+kill ${x_pid}
+exit $ret

-- 
akonadi-search packaging