[SCM] kitemviews packaging branch, master, updated. debian/5.19.0-1-26-ga428f6b

Maximiliano Curia maxy at moszumanska.debian.org
Wed May 4 18:55:30 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kitemviews.git;a=commitdiff;h=0109467

The following commit has been merged in the master branch:
commit 0109467ac108b6f76993ab57f7907eca6c6f7773
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 20:45:05 2016 +0200

    Drop Xephyr hack
---
 debian/tests/testsuite          | 9 +++------
 debian/tests/testsuite.xsession | 4 ++++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 07adfac..c49c862 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -2,10 +2,7 @@
 
 [ -e debian/tests.home ] || mkdir debian/tests.home
 export HOME="$(pwd)/debian/tests.home"
-mkdir "$HOME"/.config || true
+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}; rm -rf debian/tests.home" 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

-- 
kitemviews packaging



More information about the pkg-kde-commits mailing list