[SCM] libksysguard packaging branch, kubuntu_utopic_next, updated. bbaa5bacb85cc256c8152f90f7da654b6018cc1b

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/libksysguard.git;a=commitdiff;h=bbaa5ba

The following commit has been merged in the kubuntu_utopic_next branch:
commit bbaa5bacb85cc256c8152f90f7da654b6018cc1b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Oct 7 09:18:57 2014 +0200

    Switch to autopkgtest as test suite and override the build time test.
    
    * Switch to autopkgtest as test suite and override the build time test.
      - We need a more advanced setup as internally libksysguard will use
        kwindowsystem to identify windows running in the current netwm session,
        which will give unintended results (namely right now kwindowsystem
        crashes) if there is no window manager. So we are running a more
        advanced setup using autopkgtest and openbox.
---
 debian/changelog                |  6 ++++++
 debian/control                  |  1 +
 debian/rules                    |  3 +--
 debian/tests/control            |  4 ++++
 debian/tests/testsuite          | 10 ++++++++++
 debian/tests/testsuite.xsession | 10 ++++++++++
 6 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 453acb3..b28fda6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,12 @@ libksysguard (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
       /etc making the manual move from /usr/etc to /etc pointless.
     + Drop not-installed as the only filelisted there was the moved /usr/etc/
       file
+  * Switch to autopkgtest as test suite and override the build time test.
+    - We need a more advanced setup as internally libksysguard will use
+      kwindowsystem to identify windows running in the current netwm session,
+      which will give unintended results (namely right now kwindowsystem
+      crashes) if there is no window manager. So we are running a more
+      advanced setup using autopkgtest and openbox.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:27:56 +0200
 
diff --git a/debian/control b/debian/control
index 30d51a2..d9e34f1 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: cmake,
                xvfb
 Standards-Version: 3.9.5
 Section: libs
+XS-Testsuite: autopkgtest
 Homepage: https://projects.kde.org/projects/kde/workspace/libksysguard
 
 Package: libkf5sysguard-dev
diff --git a/debian/rules b/debian/rules
index 11e64f5..ed5a2e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,4 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 override_dh_strip:
 	$(overridden_command) --dbg-package=libksysguard5-dbg
 
-override_dh_auto_test:
-	xvfb-run -a dh_auto_test
\ No newline at end of file
+.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..e7fde3c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @builddeps@, build-essential,
+         xvfb, xauth, dbus-x11, openbox
+Restrictions: rw-build-tree
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100644
index 0000000..00220b9
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,10 @@
+#!/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
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..3a00834
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+[ -e debian/tests.home ] || mkdir debian/tests.home
+HOME=debian/tests.home openbox &
+sleep 5
+HOME=debian/tests.home dh_auto_test
+rm -rf debian/home/tests.home
+

-- 
libksysguard packaging