[devscripts] 01/02: uscan: Test repackaging from .tgz file

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository devscripts.

commit 333298fad5e95b9f52aaf474a0291674d62c28a2
Author: Joachim Breitner <nomeata at debian.org>
Date:   Sat Mar 29 21:48:23 2014 +0100

    uscan: Test repackaging from .tgz file
---
 test/test_uscan | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/test_uscan b/test/test_uscan
index 79ea755..fe7d9f9 100755
--- a/test/test_uscan
+++ b/test/test_uscan
@@ -46,7 +46,7 @@ containsName(){
 
 # The following function tests the --repack feature
 helperTestRepack() {
-    from_comp="$1"
+    from_ext="$1"
     to_comp="$2"
     file_output="$3"
 
@@ -58,7 +58,7 @@ helperTestRepack() {
 
     cat <<END > $TMPDIR/$PKG/debian/watch
 version=3
-http://localhost:$PORT/$PKG-(\d).tar.$from_comp
+http://localhost:$PORT/$PKG-(\d).$from_ext
 END
 
     cat <<END > $TMPDIR/$PKG/debian/changelog
@@ -73,7 +73,7 @@ END
     touch $TMPDIR/repo/foo/content
 
     ( cd $TMPDIR/repo ;
-      tar cfa $PKG-1.tar.$from_comp * ;
+      tar cfa $PKG-1.$from_ext * ;
       python -m SimpleHTTPServer $PORT &
       echo $! > pid )
 
@@ -91,11 +91,12 @@ END
 
 }
 
-testRepackGZ_XZ() { helperTestRepack "gz" "xz" "XZ compressed data" ; }
-testRepackGZ_BZ2() { helperTestRepack "gz" "bz2" "bzip2 compressed data" ; }
-testRepackBZ2_GZ() { helperTestRepack "bz2" "gz" "gzip compressed data" ; }
-testRepackGZ_GZ() { helperTestRepack "gz" "gz" "gzip compressed data" ; }
-testRepackXZ_XZ() { helperTestRepack "xz" "xz" "XZ compressed data" ; }
+testRepackGZ_XZ() { helperTestRepack "tar.gz" "xz" "XZ compressed data" ; }
+testRepackGZ_BZ2() { helperTestRepack "tar.gz" "bz2" "bzip2 compressed data" ; }
+testRepackBZ2_GZ() { helperTestRepack "tar.bz2" "gz" "gzip compressed data" ; }
+testRepackGZ_GZ() { helperTestRepack "tar.gz" "gz" "gzip compressed data" ; }
+testRepackXZ_XZ() { helperTestRepack "tar.xz" "xz" "XZ compressed data" ; }
+testRepackTGZ_XZ() { helperTestRepack "tgz" "xz" "XZ compressed data" ; }
 
 # The following function tests the --repack feature, with a zip file
 testRepackZip_XZ() {

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