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

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

Commit Message

Andy Whitcroft July 21, 2017, 4:17 p.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

Marcelo Henrique Cerri July 27, 2017, 11:59 a.m. UTC | #1
On Fri, Jul 21, 2017 at 05:17:20PM +0100, Andy Whitcroft wrote:
> 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(-)
> 
> diff --git a/debian/rules b/debian/rules
> index 5fbe78f3265e..7f95f0c12ad7 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)
> +ifeq ($(DEB_BUILD_PROFILES),autopkgtest)

Shouldn't this test be like that?

	ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)

Since `man dpkg-buildpackage` describes it as:

	The default behavior is to build for no specific profile. Also
	sets them (as a space separated list) as the DEB_BUILD_PROFILES
	environment variable which allows[...]

>  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
> -- 
> 2.11.0
> 
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Andy Whitcroft July 27, 2017, 12:49 p.m. UTC | #2
On Thu, Jul 27, 2017 at 08:59:36AM -0300, Marcelo Henrique Cerri wrote:
> On Fri, Jul 21, 2017 at 05:17:20PM +0100, Andy Whitcroft wrote:
> > 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(-)
> > 
> > diff --git a/debian/rules b/debian/rules
> > index 5fbe78f3265e..7f95f0c12ad7 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)
> > +ifeq ($(DEB_BUILD_PROFILES),autopkgtest)
> 
> Shouldn't this test be like that?
> 
> 	ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)

Strictly that is more correct yet.  As it happens our use case we will
only ever want to use this profile on its own so the profile should be
singular in all cases we care about this specific value.

-apw
Marcelo Henrique Cerri July 27, 2017, 1:33 p.m. UTC | #3
On Thu, Jul 27, 2017 at 01:49:10PM +0100, Andy Whitcroft wrote:
> On Thu, Jul 27, 2017 at 08:59:36AM -0300, Marcelo Henrique Cerri wrote:
> > On Fri, Jul 21, 2017 at 05:17:20PM +0100, Andy Whitcroft wrote:
> > > 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(-)
> > > 
> > > diff --git a/debian/rules b/debian/rules
> > > index 5fbe78f3265e..7f95f0c12ad7 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)
> > > +ifeq ($(DEB_BUILD_PROFILES),autopkgtest)
> > 
> > Shouldn't this test be like that?
> > 
> > 	ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
> 
> Strictly that is more correct yet.  As it happens our use case we will
> only ever want to use this profile on its own so the profile should be
> singular in all cases we care about this specific value.
> 
> -apw

Ok.

Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Stefan Bader July 27, 2017, 3:34 p.m. UTC | #4
On 21.07.2017 18:17, 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>

> ---

As always, I'd added some of the explanation verbatim into the commit message to
have in in place... ;)

-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..7f95f0c12ad7 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)
> +ifeq ($(DEB_BUILD_PROFILES),autopkgtest)
>  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
>

Patch
diff mbox

diff --git a/debian/rules b/debian/rules
index 5fbe78f3265e..7f95f0c12ad7 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)
+ifeq ($(DEB_BUILD_PROFILES),autopkgtest)
 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