[SCM] modemmanager-qt packaging branch, master, updated. debian/5.2.2-1-26-g81fe243

Maximiliano Curia maxy at moszumanska.debian.org
Fri Apr 24 15:03:39 UTC 2015


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

The following commit has been merged in the master branch:
commit bbda2804ed7d5719e24aa3f89d45fdd5b7d9835f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 16 10:45:37 2015 +0200

    Keep test at build time.
---
 debian/rules                    |  2 --
 debian/tests/control            | 10 ++++++----
 debian/tests/testsuite          |  9 +--------
 debian/tests/testsuite.xsession | 10 ----------
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2b8ae40..967fe7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,5 +4,3 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libkf5modemmanagerqt6-dbg
-
-.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
index e7fde3c..d9b40f1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,6 @@
-Tests: testsuite
-Depends: @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
-Restrictions: rw-build-tree
+# Tests: testsuite
+# Depends: @, @builddeps@, build-essential
+# Restrictions: build-needed
+
+Tests: acc
+Depends: @, dh-acc, exuberant-ctags
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..dabe645 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,10 +1,3 @@
 #!/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
+dh_auto_test
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
deleted file mode 100755
index 3a00834..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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
-

-- 
modemmanager-qt packaging



More information about the pkg-kde-commits mailing list