[devscripts] 01/07: test/test_uscan: use 3.0 (quilt) format if uupdate used

[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 57d669803ca38b7470b2e0815a53cc5e7e203701
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Sep 13 20:05:26 2015 +0900

    test/test_uscan: use 3.0 (quilt) format if uupdate used
    
    Test scripts are run without previous debian.diff nor debian.tar.xz.  In
    order to autogenerate debian.tar.xz, set "3.0 (quilt)".  This is needed
    since the upcoming uupdate does not automatically force debian.tar.xz
    generation any more.
    
    3 revert commits will be followed by 3 new reorganized and cleaned
    commits.  In between these, the test script may not work.
---
 test/test_uscan | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/test_uscan b/test/test_uscan
index f89fcb9..97926eb 100755
--- a/test/test_uscan
+++ b/test/test_uscan
@@ -167,7 +167,7 @@ END
     ( cd $TMPDIR/repo ;
       zip -q -r $PKG-1.zip * )
 
-    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMANDDEHS --dehs --repack --compression=$to_comp) )
+    OUTPUT=$( (cd $TMPDIR/$PKG ; $COMMANDDEHS --repack --compression=$to_comp) )
     assertEquals "uscan: exit_code!=0 but exit_code=0" "$?" "0"
 
     TARBALL=${PKG}_1.orig.tar.$to_comp
@@ -215,6 +215,10 @@ Files-Excluded: exclude-this
  */js/jquery.js
  ;?echo?baz;?#
 END
+    if [ -n "$SRCFORMAT" ]; then
+	mkdir -p $PKG/debian/source
+	echo "$SRCFORMAT" > $PKG/debian/source/format
+    fi
 
     mkdir -p repo
     touch repo/include-this
@@ -258,6 +262,7 @@ testFileExclusion() {
       cd $TMPDIR
       OPTS="opts=repacksuffix=+dfsg1,dversionmangle=s/\+dfsg\d*$// "
       SCRIPT="uupdate"
+      SRCFORMAT="3.0 (quilt)"
       helperCreateRepo
       cd repo
       tar cfz $PKG-1.tar.gz * .hidden )
@@ -333,6 +338,7 @@ testFileExclusionZipToTar() {
 
     (
       cd $TMPDIR
+      SRCFORMAT="3.0 (quilt)"
       helperCreateRepo
       cat <<END > $PKG/debian/watch
 version=3

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