[SCM] modemmanager-qt packaging branch, master, updated. debian/5.37.0-2-87-gb819f43

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 83b3cce0d5e800064231bc38052f8c7bfb1bae13
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jun 23 14:46:17 2015 +0200

    Update tests to run in xsesson with dbus
---
 debian/.gitattributes           |  1 -
 debian/changelog                |  6 ++++++
 debian/tests/control            |  4 +++-
 debian/tests/testsuite          | 15 ++++++++++++++-
 debian/tests/testsuite.xsession | 10 ++++++++++
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 3ee4d05..6809fb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+modemmanager-qt (5.10.0-0ubuntu3) wily; urgency=medium
+
+  * Update tests to run in xsesson with dbus
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 23 Jun 2015 14:21:19 +0200
+
 modemmanager-qt (5.10.0-0ubuntu2) wily; urgency=medium
 
   * No change rebuild to retry tests
diff --git a/debian/tests/control b/debian/tests/control
index 1d0852f..a5d6368 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,7 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential, dbus-x11
+Depends: @, @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11, openbox,
+         libkf5service-bin, kded5, kinit
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index be87224..2b8c5a0 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,16 @@
 #!/bin/sh
 
-dbus-launch --exit-with-session dh_auto_test
+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
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
+xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+ret=$?
+rm -rf debian/tests.home
+exit $ret
+
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100644
index 0000000..3f92f82
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+openbox &
+sleep 5
+kdeinit5
+dh_auto_test
+ret=$?
+kdeinit5_shutdown
+exit $ret

-- 
modemmanager-qt packaging