[SCM] kwayland packaging branch, master, updated. ecf51afa8b03135e2362e814239dd305b0825ca6
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 26 12:40:38 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwayland.git;a=commitdiff;h=5c2bbde
The following commit has been merged in the master branch:
commit 5c2bbde6b509e02230206faa65223da15b8b4fac
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Tue Mar 24 17:06:58 2015 +0100
Fix testsuite script and deps
---
debian/tests/control | 3 ++-
debian/tests/testsuite | 5 +++++
debian/tests/testsuite.xsession | 5 -----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/debian/tests/control b/debian/tests/control
index 744fce7..6908221 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
Tests: testsuite
Depends: @, @builddeps@, build-essential,
- xvfb, xauth, dbus-x11, openbox
+ xvfb, xauth, dbus-x11, openbox,
+ libpam-systemd, weston
Restrictions: rw-build-tree
Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..6e2f35d 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -3,8 +3,13 @@
if [ -d /usr/lib/ccache ]; then
export PATH="/usr/lib/ccache:$PATH"
fi
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
debian/rules clean 2>&1
dpkg-source --before-build .
debian/rules build 2>&1
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
index c849da6..ac568a2 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,11 +1,6 @@
#!/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/tests.home
-exit $ret
--
kwayland packaging
More information about the pkg-kde-commits
mailing list