[devscripts] 01/02: test_package_lifecycle: Import patch from Ubuntu to have the test pass on their builders too

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository devscripts.

commit 70675c61f95d62a751e1f54de4b96512812353e2
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Jan 27 14:58:05 2017 +0100

    test_package_lifecycle: Import patch from Ubuntu to have the test pass on their builders too
    
    filter out output from pkg-create-dbgsym's dh_gencontrol wrapper, pass
    --set-envvar=NO_PKG_MANGLE=1 to debuild, and pass -U to debchange.
---
 debian/changelog            | 8 ++++++--
 test/test_package_lifecycle | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ef3924..e0d2676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-devscripts (2.17.1) UNRELEASED; urgency=medium
+devscripts (2.17.2) UNRELEASED; urgency=medium
 
   [ Osamu Aoki ]
   * uscan:
@@ -11,8 +11,12 @@ devscripts (2.17.1) UNRELEASED; urgency=medium
   [ Mattia Rizzolo ]
   * dscverify:
     + Remove reference to the long gone debian-maintainers package.
+  * test_package_lifecycle:
+    + Import patch from Ubuntu to have the test pass on their builders too:
+      filter out output from pkg-create-dbgsym's dh_gencontrol wrapper, pass
+      --set-envvar=NO_PKG_MANGLE=1 to debuild, and pass -U to debchange.
 
- -- Mattia Rizzolo <mattia at debian.org>  Fri, 27 Jan 2017 14:36:18 +0100
+ -- Mattia Rizzolo <mattia at debian.org>  Fri, 27 Jan 2017 14:56:35 +0100
 
 devscripts (2.17.0) unstable; urgency=medium
 
diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 310f94e..e6908c6 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -100,6 +100,7 @@ runCommandOutCmpFile() {
     eval "${COMMAND} $param"  2> ${stderrF} | \
 	grep -v File::FcntlLock | \
 	grep -v '^  *dh_' | \
+	grep -v '^dh_gencontrol debug symbol wrapper:' | \
 	sed -e "s/\`/'/g" | \
 	sed -e "s/^dpkg-buildpackage: info: /dpkg-buildpackage: /g" | \
 	sed -e "s/^dpkg-genchanges: info: /dpkg-genchanges: /g" | \
@@ -118,7 +119,7 @@ runCommandOutCmpFile() {
 test_debuild() {
   export GNUPGHOME=$GPGHOME
   cd ${WORKDIR}/package_lifecycle/test
-  COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME'
+  COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1'
   cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
 	 dpkg-buildpackage -us -uc
 	dpkg-buildpackage: source package test
@@ -220,7 +221,7 @@ test_debchange () {
 	
 	 -- Testophilus Testownik <tester at testity.org>
 EOS
-  runCommand "-i 'new killer app functionality'" "" "" 0
+  runCommand "-iU 'new killer app functionality'" "" "" 0
   COMMAND=cat
   runCommandOutCmpFile "debian/changelog" "../debchange.txt" "" 0
   cd ${WORKDIR}
@@ -244,7 +245,7 @@ EOS
 test_debuild2() {
   export GNUPGHOME=$GPGHOME
   cd ${WORKDIR}/package_lifecycle/test
-  COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME'
+  COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1'
   cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
 	 dpkg-buildpackage -us -uc
 	dpkg-buildpackage: source package test

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git