[SCM] cantor packaging branch, master, updated. debian/15.08.3-1-12-gca46cac

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/cantor.git;a=commitdiff;h=c868f08

The following commit has been merged in the master branch:
commit c868f0843bae37095d67b8fa79888a7becc8be08
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 12 09:39:48 2016 +0100

    Update testsuite to use xephyr
---
 debian/tests/control            | 2 +-
 debian/tests/testsuite          | 7 ++++++-
 debian/tests/testsuite.xsession | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 7b5f05b..a2db8df 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11,
-         gnuplot, python-numpy
+         gnuplot, python-numpy, xserver-xephyr
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index fa0feb1..d8e054c 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 debian/tests/testsuite.xsession
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+kill ${x_pid}
+exit $ret
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 7e49196..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
-kdeinit4
 dh_auto_test
-ret=$?
-kdeinit4_shutdown
-exit $ret

-- 
cantor packaging