[SCM] Akonadi packaging branch, master, updated. debian/16.04.1-1-13-g13906e0

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=c4cec23

The following commit has been merged in the master branch:
commit c4cec232cd0448f9bb834f32422c95cc0fbfb772
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 3 10:45:33 2016 +0200

    testsuite: Set the akonaditest path
    
    This is a workaround for an upstream bug, the find_program runs before
    akonaditest is generated.
    
    Also update the testsuite files to handle HOME a bit more gracefully,
    and provide a swrast to reduce the amount of warnings.
---
 debian/rules           |  3 ++-
 debian/tests/control   |  2 +-
 debian/tests/testsuite | 10 +++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 178c498..696231a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
-	    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+	    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
+	    -D_testrunner=/usr/bin/akonaditest
 
 override_dh_installinit:
 	$(overridden_command)
diff --git a/debian/tests/control b/debian/tests/control
index d896229..7d70644 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, libxml2-utils
+         xvfb, xauth, dbus-x11, libxml2-utils, libgl1-mesa-dri
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c93c619..053d3cb 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,8 @@
 #!/bin/sh
-
-mkdir -p ${ADTTMP}/home
-HOME=${ADTTMP}/home xvfb-run -a dbus-launch --exit-with-session dh_auto_test
+if [ -z "$HOME" ] || [ ! -d "$HOME" ]; then
+    [ -e debian/tests.home ] || mkdir debian/tests.home
+    export HOME="$(pwd)/debian/tests.home"
+    trap "rm -rf debian/tests.home" EXIT
+fi
+mkdir -p "$HOME"/.config || true
+xvfb-run -a dbus-launch --exit-with-session dh_auto_test

-- 
Akonadi packaging