UBUNTU: [Packaging] tests -- reduce rebuild test to one flavour

BugLink: http://bugs.launchpad.net/bugs/1705495
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index 7f67744e184b1b96acc596a44980883cb0880ddf..a70cd8fb9b50caa6c2a33f80ee9023991bd2f3f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 
 # autopkgtest -- rebuild support
 #  only build the first flavour on the assumption it is representative
-ifeq ($(DEB_BUILD_PROFILE),autopkgtest)
+ifeq ($(DEB_BUILD_PROFILES),autopkgtest)
 flavours := $(firstword $(flavours))
 endif
 

diff --git a/debian/tests/rebuild b/debian/tests/rebuild
index 6f73b36c1b5edb52af690243780e6c839f9ec1ba..81491565a4518ed5644135a7552c688a21e5890b 100644 (file)
--- a/debian/tests/rebuild
+++ b/debian/tests/rebuild
@@ -17,4 +17,4 @@ if [ "$build_needed" -eq 0 ]; then
 fi
 
 set -e
-dpkg-buildpackage -rfakeroot -us -uc -b
+dpkg-buildpackage -rfakeroot -us -uc -b -Pautopkgtest