diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-07 23:53:46 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-08 00:19:56 +0000 |
commit | 41fad13df107b63b29029198e88ef068d12ae00c (patch) | |
tree | b8bdcd0733d06374b8a2fb93f37f836db4f99799 | |
parent | 36b36dbb7a6d685dcb7c9f22bfe66113006d6d4e (diff) |
Test suite: import-tarbomb: Split out from import-nonnative
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/tests/control | 2 | ||||
-rwxr-xr-x | tests/tests/import-nonnative | 41 | ||||
-rwxr-xr-x | tests/tests/import-tarbomb | 49 |
3 files changed, 50 insertions, 42 deletions
diff --git a/debian/tests/control b/debian/tests/control index cf37ca7..4ed5327 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -25,7 +25,7 @@ Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, make Restrictions: x-dgit-git-only -Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt +Tests: absurd-gitapply build-modes build-modes-asplit build-modes-gbp-asplit clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig import-dsc import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains rpush tag-updates test-list-uptodate trustingpolicy-replay unrepresentable version-opt Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, make diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative index fa9b74b..d324172 100755 --- a/tests/tests/import-nonnative +++ b/tests/tests/import-nonnative @@ -14,45 +14,4 @@ t-import-chk example 1.0-1 # 3.0 (quilt), single-debian-patch, one orig t-import-chk sunxi-tools 1.2-2.~~dgittest -mangle1 () { - rm -f ${1}_* - t-import-chk1 "$@" - cd $tmp/mirror/pool/main - dpkg-source -x ${p}_${v}.dsc td - orig=${p}_${v%-*}.orig.tar.gz - tar zxf $orig - rm $orig ${p}_${v}.* - cd $p - mkdir urk - echo urk >urk/urk - export GZIP=-1 -} -mangle2 () { - cd .. - dpkg-source -b td - rm -rf $p td - cd $tmp - t-archive-none $p - t-archive-query - t-import-chk2 -} - -# 3.0 (quilt), multiple patches, tarbomb orig -mangle1 example 1.0-1 -tar zvcf ../$orig * -mangle2 - -# 3.0 (quilt), multiple patches, tarbomb orig with dot -mangle1 example 1.0-1 -tar zvcf ../$orig . -mangle2 - -# 3.0 (quilt), multiple patches, tarbomb orig with dot and .git and .pc -mangle1 example 1.0-1 -git init -mkdir .pc -echo SPONG >.pc/SPONG -tar zvcf ../$orig . -mangle2 - echo done. diff --git a/tests/tests/import-tarbomb b/tests/tests/import-tarbomb new file mode 100755 index 0000000..c0bc4c4 --- /dev/null +++ b/tests/tests/import-tarbomb @@ -0,0 +1,49 @@ +#!/bin/bash +set -e +. tests/lib +. $troot/lib-import-chk + +t-tstunt-parsechangelog + +mangle1 () { + rm -f ${1}_* + t-import-chk1 "$@" + cd $tmp/mirror/pool/main + dpkg-source -x ${p}_${v}.dsc td + orig=${p}_${v%-*}.orig.tar.gz + tar zxf $orig + rm $orig ${p}_${v}.* + cd $p + mkdir urk + echo urk >urk/urk + export GZIP=-1 +} +mangle2 () { + cd .. + dpkg-source -b td + rm -rf $p td + cd $tmp + t-archive-none $p + t-archive-query + t-import-chk2 +} + +# 3.0 (quilt), multiple patches, tarbomb orig +mangle1 example 1.0-1 +tar zvcf ../$orig * +mangle2 + +# 3.0 (quilt), multiple patches, tarbomb orig with dot +mangle1 example 1.0-1 +tar zvcf ../$orig . +mangle2 + +# 3.0 (quilt), multiple patches, tarbomb orig with dot and .git and .pc +mangle1 example 1.0-1 +git init +mkdir .pc +echo SPONG >.pc/SPONG +tar zvcf ../$orig . +mangle2 + +echo done. |