This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit c2538c1b81148f9b3079a66de3244f4bf3866519 Author: James McCoy <[email protected]> Date: Tue Jan 26 20:20:25 2016 -0500 test_package_lifecycle: Filter out specific dh_* commands The specific commands don't matter and can change over time, making the test fail. Closes: #812661 Signed-off-by: James McCoy <[email protected]> --- debian/changelog | 4 ++++ test/test_package_lifecycle | 42 +----------------------------------------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 95fb01d..b046d33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,10 @@ devscripts (2.16.1) UNRELEASED; urgency=medium * chdist: + Symlink, rather than copy, the archive keyrings into the chdist tree so they don't get stale. (Closes: #783497) + * test_package_lifecycle: Ignore listing of dh_* commands in debuild output. + The specific commands aren't interesting, so much as the steps that the + build goes through. Fixes FTBFS due to new dh_update_autotools_config + command. (Closes: #812661) [ Christoph Berg ] * debcheckout: Add auth mapping for https://github.com. diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle index 74a22ce..c2908f4 100755 --- a/test/test_package_lifecycle +++ b/test/test_package_lifecycle @@ -99,7 +99,7 @@ runCommandOutCmpFile() { local stderrF="${SHUNIT_TMPDIR}/stderr" eval "${COMMAND} $param" 2> ${stderrF} | \ grep -v File::FcntlLock | \ - grep -v dh_strip_nondeterminism | \ + grep -v '^ *dh_' | \ sed -e "s/\`/'/g" | \ sed -e's!^ -- Testophilus Testownik <[email protected]>.*! -- Testophilus Testownik <[email protected]>!' > ${stdoutF} retval=$? @@ -125,9 +125,6 @@ test_debuild() { dpkg-buildpackage: host architecture ${_ARCH} fakeroot debian/rules clean dh clean - dh_testdir - dh_auto_clean - dh_clean dpkg-source -b test dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building test using existing ./test_1.0.orig.tar.xz @@ -135,25 +132,8 @@ test_debuild() { dpkg-source: info: building test in test_1.0-1.dsc debian/rules build dh build - dh_testdir - dh_auto_configure - dh_auto_build - dh_auto_test fakeroot debian/rules binary dh binary - dh_testroot - dh_prep - dh_auto_install - dh_installdocs - dh_installchangelogs - dh_perl - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb dpkg-deb: building package 'test' in '../test_1.0-1_all.deb'. dpkg-genchanges >../test_1.0-1_${_ARCH}.changes dpkg-genchanges: including full source code in upload @@ -271,9 +251,6 @@ test_debuild2() { dpkg-buildpackage: host architecture ${_ARCH} fakeroot debian/rules clean dh clean - dh_testdir - dh_auto_clean - dh_clean dpkg-source -b test dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building test using existing ./test_1.0.orig.tar.xz @@ -281,25 +258,8 @@ test_debuild2() { dpkg-source: info: building test in test_1.0-2.dsc debian/rules build dh build - dh_testdir - dh_auto_configure - dh_auto_build - dh_auto_test fakeroot debian/rules binary dh binary - dh_testroot - dh_prep - dh_auto_install - dh_installdocs - dh_installchangelogs - dh_perl - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb dpkg-deb: building package 'test' in '../test_1.0-2_all.deb'. dpkg-genchanges >../test_1.0-2_${_ARCH}.changes dpkg-genchanges: not including original source code in upload -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
