Fix autopkgtests

3 files changed, 16 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 28d725b..d61d3fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+kpackage (5.30.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix autopkgtests:
+   - instead of rebuilding the package in the debian/tests/testsuite script,
+     use the restriction 'build-needed' so the autopkgtests tech will handle
+     the package rebuilding, see:
+     https://people.debian.org/~mpitt/autopkgtest/README.package-tests.html
+     this is good because this way the autopkgtest artifact 'testsuite-stdout'
+     will have only the stdout of 'make -j1 test' instead of a complete build
+     log, making easier to read
+   - add '@' to Depends of 'testsuite' so it won't fail
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Fri, 03 Feb 2017 17:21:29 +0100
+
 kpackage (5.30.0-0ubuntu1) zesty; urgency=medium
 
   * Add new desktop file to install files
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..eab02ba 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,13 +1,5 @@
 #!/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