[SCM] kconfig packaging branch, master, updated. debian/5.16.0-1-13-gb9dcf2a
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Feb 14 18:56:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfig.git;a=commitdiff;h=d3bd752
The following commit has been merged in the master branch:
commit d3bd7520f950783c1d654894df7c99482b3a0cdf
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Feb 13 23:40:20 2016 +0100
Hacky use of xephyr
---
debian/tests/control | 2 +-
debian/tests/testsuite | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/tests/control b/debian/tests/control
index 9cfb478..799fa6d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
Tests: testsuite
Depends: @, @builddeps@, build-essential,
- xvfb, xauth, dbus-x11, kinit
+ xvfb, xauth, dbus-x11, kinit, xserver-xephyr
Restrictions: build-needed
Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 2256256..c34d8f2 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -4,7 +4,8 @@
export HOME="$(pwd)/debian/tests.home"
mkdir "$HOME"/.config || true
xvfb-run -a --server-args="-screen 0 1024x768x24" \
- dbus-launch --exit-with-session debian/tests/testsuite.xsession
-ret=$?
-rm -rf debian/tests.home
-exit $ret
+ Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "{ kill ${x_pid}; rm -rf debian/tests.home }" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session debian/tests/testsuite.xsession
--
kconfig packaging
More information about the pkg-kde-commits
mailing list