[SCM] kitemmodels packaging branch, master, updated. debian/5.16.0-1-11-g62c829c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 338a9eb3c868c35ea11e4db11993cf3079b9277a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 14 09:23:39 2016 +0100

    Move auto_tests back to autopkgtests using xephyr
---
 debian/control         | 4 +---
 debian/rules           | 3 ++-
 debian/tests/control   | 6 +++---
 debian/tests/testsuite | 7 ++++++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 45b5319..0b31fb6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,7 @@ Build-Depends: cmake (>= 2.8.12),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),
                qtdeclarative5-dev (>= 5.3.0~),
-               qtscript5-dev (>= 5.4),
-               xauth,
-               xvfb
+               qtscript5-dev (>= 5.4)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/frameworks/kitemmodels
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kitemmodels.git
diff --git a/debian/rules b/debian/rules
index 3b87058..1db28aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,4 +7,5 @@ override_dh_strip:
 	dh_strip --ddeb-migration='libkf5itemmodels5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	xvfb-run -a $(overridden_command)
+	# Disable auto_tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 541be7d..bdd3d8f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential
-# Restrictions: build-needed
+Tests: testsuite
+Depends: @, @builddeps@, build-essential, xvfb, xauth, dbus-x11, xserver-xephyr
+Restrictions: build-needed
 
 Tests: acc
 Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 61f9406..f47a079 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-xvfb-run -a --server-args="-screen 0 1024x768x24+32" dh_auto_test
+xvfb-run -a --server-args="-screen 0 1024x768x24" \
+    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
+
+trap "{ kill ${x_pid} }" EXIT
+
+DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test

-- 
kitemmodels packaging