[devscripts] 01/01: test_package_lifecycle: jessie backport safe test

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit 41b982013adf5f4bad31aa0b14f5a1fb157faa27
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Dec 6 00:40:36 2015 +0900

    test_package_lifecycle: jessie backport safe test
    
     * Filter STDOUT through ` -> '
     * make test ignore dh_strip_nondeterminism
    
    dpkg-source changed its output style
    < dpkg-source: info: using source format `3.0 (quilt)'
    ---
    > dpkg-source: info: using source format '3.0 (quilt)'
    
    dh_strip_nondeterminism happens only under stretch
---
 test/test_package_lifecycle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/test_package_lifecycle b/test/test_package_lifecycle
index 17e42a2..41be7ed 100755
--- a/test/test_package_lifecycle
+++ b/test/test_package_lifecycle
@@ -93,7 +93,11 @@ runCommandOutCmpFile() {
     local exp_retval=$4
     local stdoutF="${SHUNIT_TMPDIR}/stdout"
     local stderrF="${SHUNIT_TMPDIR}/stderr"
-    eval "${COMMAND} $param"  2> ${stderrF} | grep -v File::FcntlLock | sed -e's!^ -- Testophilus Testownik <tester at testity.org>.*! -- Testophilus Testownik <tester at testity.org>!' > ${stdoutF}
+    eval "${COMMAND} $param"  2> ${stderrF} | \
+	grep -v File::FcntlLock | \
+	grep -v dh_strip_nondeterminism | \
+	sed -e "s/\`/'/g" | \
+	sed -e's!^ -- Testophilus Testownik <tester at testity.org>.*! -- Testophilus Testownik <tester at testity.org>!' > ${stdoutF}
     retval=$?
 	eval "cmp ${stdoutF} ${exp_stdoutfile}" 3>&1 >/dev/null
 	local diffretval=$?
@@ -140,7 +144,6 @@ test_debuild() {
 	   dh_installchangelogs
 	   dh_perl
 	   dh_link
-	   dh_strip_nondeterminism
 	   dh_compress
 	   dh_fixperms
 	   dh_installdeb
@@ -287,7 +290,6 @@ test_debuild2() {
 	   dh_installchangelogs
 	   dh_perl
 	   dh_link
-	   dh_strip_nondeterminism
 	   dh_compress
 	   dh_fixperms
 	   dh_installdeb

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