[SCM] kpackage packaging branch, master, updated. debian/5.28.1-1-11-gff32825

Maximiliano Curia maxy at moszumanska.debian.org
Sat Jul 8 07:20:21 UTC 2017


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

The following commit has been merged in the master branch:
commit cf764cfdcd7b01072295b15c9a63a98c2647b656
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 7 09:48:35 2017 +0200

    Let autopkgtest take care of the build required for the test
---
 debian/tests/control   |  4 ++--
 debian/tests/testsuite | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 71eb911..0638f20 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
-Depends: @builddeps@, build-essential
-Restrictions: rw-build-tree
+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 33b714e..e8b4ec1 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,17 +1,12 @@
 #!/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
-
 export LANG=C.UTF-8
 export LC_ALL=C.UTF-8
-[ -e debian/tests.home ] || mkdir debian/tests.home
-HOME="$(pwd)/debian/tests.home" dh_auto_test
-ret=$?
-rm -rf debian/tests.home
-exit $ret
+
+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
+
+dh_auto_test

-- 
kpackage packaging



More information about the pkg-kde-commits mailing list