[SCM] kitemmodels packaging branch, master, updated. debian/5.19.0-1-25-g598c977
Maximiliano Curia
maxy at moszumanska.debian.org
Wed May 4 18:40:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kitemmodels.git;a=commitdiff;h=598c977
The following commit has been merged in the master branch:
commit 598c9775ac6ad9b08a959fc5d49c9b139b2eecec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed May 4 20:10:26 2016 +0200
Drop Xephyr hack
---
debian/tests/testsuite | 10 +++++-----
debian/tests/testsuite.xsession | 4 ++++
2 files changed, 9 insertions(+), 5 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
new file mode 100755
index 0000000..35976a5
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,4 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+dh_auto_test
--
kitemmodels packaging
More information about the pkg-kde-commits
mailing list