[SCM] bluez-qt packaging branch, master, updated. debian/5.19.0-1-29-gac3a84c

Maximiliano Curia maxy at moszumanska.debian.org
Wed May 4 15:01:36 UTC 2016


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

The following commit has been merged in the master branch:
commit ac3a84c7bfa3c5ae13c6e5fc17930c8b54a9595d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed May 4 16:40:36 2016 +0200

    Drop Xephyr hack
---
 debian/tests/testsuite          | 20 +++++---------------
 debian/tests/testsuite.xsession |  8 +-------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 2024c22..c49c862 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,18 +1,8 @@
 #!/bin/sh
 
-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" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-sleep 1
-DISPLAY=:2 openbox & openbox_pid=$!
-sleep 1
-
-trap "kill ${openbox_pid}; kill ${x_pid}; rm -rf debian/tests.home" EXIT
-
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
+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" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index 809d194..ac4bf26 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,11 +1,5 @@
 #!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-[ -e debian/tests.home ] || mkdir debian/tests.home
-export HOME="$(pwd)/debian/tests.home"
+
 openbox &
 sleep 5
 dh_auto_test
-ret=$?
-rm -rf debian/home/tests.home
-exit $ret

-- 
bluez-qt packaging



More information about the pkg-kde-commits mailing list