[SCM] kconfig packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-4-g8a3a900

Kubuntu CI (Harald Sitter) kubuntu-ci-guest at moszumanska.debian.org
Wed May 20 00:00:35 UTC 2015


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

The following commit has been merged in the kubuntu_unstable branch:
commit c22818e8ba3d338374c888decf432c6c4e3fb986
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Mar 14 21:14:52 2015 +0100

    More sensible tests
---
 debian/tests/control            |  4 ++--
 debian/tests/testsuite          | 13 ++++++-------
 debian/tests/testsuite.xsession |  2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 05ffab1..6e86a05 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,7 @@
 Tests: testsuite
-Depends: @builddeps@, build-essential,
+Depends: @, @builddeps@, build-essential,
          xvfb, xauth, dbus-x11, kinit
-Restrictions: rw-build-tree
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c511f0c..1b856df 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,9 @@
 #!/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
+
+[ -e debian/tests.home ] || mkdir debian/tests.home
+export HOME="$(pwd)/debian/tests.home"
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
     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 9ff1250..202deb4 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,8 +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"
 kdeinit5
 dh_auto_test
 ret=$?

-- 
kconfig packaging



More information about the pkg-kde-commits mailing list