[devscripts] 15/18: debuild: Update tests to account removal of dpkg-buildpackage emulation

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 762db4078b76f3eacdbaa98a6726d4ae53a86770
Author: James McCoy <jamessan at debian.org>
Date:   Sun Nov 20 17:20:38 2016 -0500

    debuild: Update tests to account removal of dpkg-buildpackage emulation
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 test/test_package_lifecycle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index a0fba73..149f597 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -103,6 +103,7 @@ runCommandOutCmpFile() {
 	sed -e "s/\`/'/g" | \
 	sed -e "s/^dpkg-buildpackage: info: /dpkg-buildpackage: /g" | \
 	sed -e "s/^dpkg-genchanges: info: /dpkg-genchanges: /g" | \
+	sed -e "/^ dpkg-genbuildinfo/d" | \
 	sed -e "/^gpg: /d" | \
 	sed -e's!^ -- Testophilus Testownik <tester at testity.org>.*! -- Testophilus Testownik <tester at testity.org>!' > ${stdoutF}
     retval=$?
@@ -119,7 +120,7 @@ test_debuild() {
   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'
   cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
-	 dpkg-buildpackage -rfakeroot -D -us -uc
+	 dpkg-buildpackage -us -uc
 	dpkg-buildpackage: source package test
 	dpkg-buildpackage: source version 1.0-1
 	dpkg-buildpackage: source distribution unstable
@@ -245,7 +246,7 @@ test_debuild2() {
   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'
   cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
-	 dpkg-buildpackage -rfakeroot -D -us -uc
+	 dpkg-buildpackage -us -uc
 	dpkg-buildpackage: source package test
 	dpkg-buildpackage: source version 1.0-2
 	dpkg-buildpackage: source distribution UNRELEASED

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