[SCM] kscreen packaging branch, master, updated. debian/5.2.2-1-16-ge87175d
Maximiliano Curia
maxy at moszumanska.debian.org
Wed Jul 1 12:18:18 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kscreen.git;a=commitdiff;h=d1345e4
The following commit has been merged in the master branch:
commit d1345e44251f18a292c72853e0e30b5c5ecacfee
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jul 1 11:46:55 2015 +0200
Simplify the testsuite
---
debian/tests/control | 6 +++---
debian/tests/testsuite | 7 +------
debian/tests/testsuite.xsession | 10 +---------
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/debian/tests/control b/debian/tests/control
index e7fde3c..d5cbac6 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
Tests: testsuite
-Depends: @builddeps@, build-essential,
- xvfb, xauth, dbus-x11, openbox
-Restrictions: rw-build-tree
+Depends: @, @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, xserver-xephyr, libkf5service-bin
+Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index bde888c..fa0feb1 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,9 +1,4 @@
#!/bin/sh
-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
+
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 ae25292..fa94c56 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,13 +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
-#tests are broken : Tests don't pass but Alex promised he'll look at it.
-#Uncomment next line when fixed.
+
dh_auto_test
-ret=$?
-rm -rf debian/tests.home
-exit $ret
--
kscreen packaging
More information about the pkg-kde-commits
mailing list