[SCM] kaccounts-integration packaging branch, master, updated. debian/16.08.3-1-45-ge431b6a

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:06:20 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=39ce97a

The following commit has been merged in the master branch:
commit 39ce97aa2cc8481f3e8d47a9599e29717c9099ec
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 4 17:54:36 2017 +0200

    Update testsuite
    
    Gbp-Dch: Ignore
---
 debian/tests/control            |  2 +-
 debian/tests/testsuite          |  8 +-------
 debian/tests/testsuite.xsession | 10 +++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 8947f26..0d8368f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
+         xvfb, xauth, dbus, openbox
 Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..60063b2 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +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+32" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-run-session -- debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
index eca81a9..9b2234f 100755
--- a/debian/tests/testsuite.xsession
+++ b/debian/tests/testsuite.xsession
@@ -1,11 +1,11 @@
 #!/bin/sh
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-export HOME="$(pwd)/debian/tests.home"
-[ -e "$HOME" ] || mkdir "$HOME"
+export HOMETMP="$(pwd)/debian/tests.home"
+[ -e "$HOMETMP" ] || mkdir "$HOMETMP"
+trap 'rm -rf '"$HOMETMP" EXIT
+export HOME="$HOMETMP"
+
 openbox &
 sleep 5
 dh_auto_test
-ret=$?
-rm -rf "$HOME"
-exit $ret

-- 
kaccounts-integration packaging



More information about the pkg-kde-commits mailing list