X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fimport-nonnative;h=7bb33a9c57b42cec4686634f2ecf8bb2205c2afe;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=fa9b74b4a80e75be0bd8820c4ddda6ac16167d10;hpb=36b36dbb7a6d685dcb7c9f22bfe66113006d6d4e;p=dgit.git

diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative
index fa9b74b4..7bb33a9c 100755
--- a/tests/tests/import-nonnative
+++ b/tests/tests/import-nonnative
@@ -4,6 +4,7 @@ set -e
 . $troot/lib-import-chk
 
 t-tstunt-parsechangelog
+t-buildproductsdir-config
 
 # 1.0 with diff
 t-import-chk pari-extra 3-1
@@ -14,45 +15,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.
+t-ok