[trusty/master-next,xenial/master-next,zesty/master-next,1/1] UBUNTU: [Packaging] tests -- reduce rebuild test to one flavour
diff mbox

Message ID 20170728094032.27994-2-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft July 28, 2017, 9:40 a.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1705495
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/rules         | 2 +-
 debian/tests/rebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Stefan Bader Aug. 3, 2017, 1:53 p.m. UTC | #1
On 28.07.2017 11:40, Andy Whitcroft wrote:
> BugLink: http://bugs.launchpad.net/bugs/1705495
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---

Hard for the people with bad eyes what the difference to v1 was but looks okay
(minus still no explanation in the patch) to me...

-Stefan

>  debian/rules         | 2 +-
>  debian/tests/rebuild | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 5fbe78f3265e..5bcd85d77a63 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -80,7 +80,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)
> +ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
>  flavours := $(firstword $(flavours))
>  endif
>  
> diff --git a/debian/tests/rebuild b/debian/tests/rebuild
> index 6f73b36c1b5e..81491565a451 100644
> --- 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
>
Marcelo Henrique Cerri Aug. 3, 2017, 8:13 p.m. UTC | #2
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Kleber Souza Aug. 8, 2017, 7:49 a.m. UTC | #3
Applied on trusty/master-next, xenial/master-next and zesty/master-next
branches. Thanks.

Patch
diff mbox

diff --git a/debian/rules b/debian/rules
index 5fbe78f3265e..5bcd85d77a63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,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)
+ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
 flavours := $(firstword $(flavours))
 endif
 
diff --git a/debian/tests/rebuild b/debian/tests/rebuild
index 6f73b36c1b5e..81491565a451 100644
--- 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