[devscripts] 01/02: mk-origtargz: Use a normalized name to match test output

[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 fbbabd8536550b84ae3f8b1e57fe2024cde5ab38
Author: James McCoy <jamessan at debian.org>
Date:   Sat May 31 09:32:13 2014 -0400

    mk-origtargz: Use a normalized name to match test output
    
    Since mk-origtargz's output uses its filename in the output, the tests
    need to match against that rather than assume it is mk-origtargz.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       | 7 +++++++
 test/test_mk-origtargz | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b318ceb..e7c220a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.14.4) UNRELEASED; urgency=medium
+
+  * mk-origtargz: Fix DEP8 test failures due to differences in how the script
+    is named when it's run.
+
+ -- James McCoy <jamessan at debian.org>  Sat, 31 May 2014 08:42:31 -0400
+
 devscripts (2.14.3) unstable; urgency=medium
 
   [ Benjamin Drung ]
diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz
index 0697d2b..e6cb61f 100755
--- a/test/test_mk-origtargz
+++ b/test/test_mk-origtargz
@@ -17,10 +17,12 @@
 
 if test "$1" = --installed; then
     MK_ORIGTARGZ="mk-origtargz"
+    PROGNAME="mk-origtargz"
     shift
 else
     top_srcdir=$(readlink -f "${0%/*}/..")
     MK_ORIGTARGZ="perl -I $top_srcdir $top_srcdir/scripts/mk-origtargz.pl"
+    PROGNAME="mk-origtargz.pl"
 fi
 
 cleanup(){
@@ -438,7 +440,7 @@ testBrokenTarWarning() {
 		"tar: This does not look like a tar archive
 tar: Skipping to next header
 tar: Exiting with failure status due to previous errors
-mk-origtargz.pl: error: tar --list --auto-compress --file ../foo_0.1.orig.tar.xz gave error exit status 2" \
+$PROGNAME: error: tar --list --auto-compress --file ../foo_0.1.orig.tar.xz gave error exit status 2" \
 		"" \
 		 ../foo-0.1.tar.gz --repack --compression xz
 }

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