[SCM] bluez-qt packaging branch, master, updated. debian/5.16.0-1-14-gdefc9d7

Maximiliano Curia maxy at moszumanska.debian.org
Tue Feb 16 12:36:25 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/bluez-qt.git;a=commitdiff;h=4d4d6cc

The following commit has been merged in the master branch:
commit 4d4d6cce30f6b7a3183a8b012993f13277242fe7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 13:26:33 2016 +0100

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

diff --git a/debian/tests/control b/debian/tests/control
index 53e831b..7d0ba00 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,8 +1,8 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox,
+         xvfb, xauth, dbus-x11, openbox, xserver-xephyr
          qml-module-qttest
-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 00220b9..0073276 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,16 @@
 #!/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
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+export HOME="$(pwd)/debian/tests.home"
+[ -e debian/tests.home ] || mkdir debian/tests.home
+mkdir "$HOME"/.config || true
+
 xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+DISPLAY=:2 openbox & openbox_pid=$!
+
+trap "{ kill ${openbox_pid};kill ${x_pid}; rm -rf debian/tests.home }" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
bluez-qt packaging



More information about the pkg-kde-commits mailing list