X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fimport-nonnative;h=356856305742f6eb5d8a43d9af0a5fdeea865dd8;hb=318d5f52db221919a0ec31ab08cc525982c3bf56;hp=98076f066d7ea44fdff11b7c01b64a766c032f24;hpb=3a434e0ecac4387bb900a078b7d65c751b99f3bb;p=dgit.git

diff --git a/tests/tests/import-nonnative b/tests/tests/import-nonnative
index 98076f06..35685630 100755
--- a/tests/tests/import-nonnative
+++ b/tests/tests/import-nonnative
@@ -1,78 +1,17 @@
 #!/bin/bash
 set -e
 . tests/lib
+. $troot/lib-import-chk
 
 t-tstunt-parsechangelog
 
-chk () {
-	p=$1
-	v=$2
-
-	t-archive $p $v
-	t-git-none
-	t-dgit --no-rm-on-error clone $p
-
-	# And now we make an update using the same orig tarball, and
-	# check that the orig import is stable.
-
-	cd $p
-
-	git branch first-import
-
-	m='Commit for import check'
-	echo "$m" >>import-check
-
-	v=${v%-*}-99
-	dch -v $v -D unstable -m "$m"
-
-	git add import-check debian/changelog
-	git commit -m "$m"
-
-	t-dgit -wgf quilt-fixup
-	t-dgit -wgf build-source
-
-	# The resulting .dsc does not have a Dgit line (because dgit push
-	# puts that in).  So we just shove it in the archive now
-
-	ln ../${p}_${v}.* $tmp/mirror/pool/main/
-	t-archive-query
-
-	t-dgit fetch
-
-	git branch first-2nd-import remotes/dgit/dgit/sid
-
-	t-git-next-date
-
-	git update-ref refs/remotes/dgit/dgit/sid first-import
-
-	t-dgit fetch
-
-	t-refs-same-start
-	t-ref-same refs/remotes/dgit/dgit/sid
-	t-ref-same refs/heads/first-2nd-import
-
-	for orig in ../${p}_${v%-*}.orig*.tar.*; do
-		orig=${orig#../}
-		pat="^Import ${orig//./\\.}\$"
-		t-refs-same-start
-		for start in first-import first-2nd-import; do
-			git log --pretty='tformat:%H' --grep "$pat" $start \
-				>../t.imp
-			test $(wc -l <../t.imp) = 1
-			imp=$(cat ../t.imp)
-			t-ref-same-val "$orig $start" "$imp"
-		done
-	done
-	cd ..
-}
-
 # 1.0 with diff
-chk pari-extra 3-1
+t-import-chk pari-extra 3-1
 
 # 3.0 (quilt), multiple patches, multiple origs
-chk example 1.0-1
+t-import-chk example 1.0-1
 
 # 3.0 (quilt), single-debian-patch, one orig
-chk sunxi-tools 1.2-2.~~dgittest
+t-import-chk sunxi-tools 1.2-2.~~dgittest
 
-echo done.
+t-ok