X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=f8d8091f38504324a7e57fe1cc81a389185afebe;hb=HEAD;hp=112bc39eb0e35623cdf3eb33a81dbb999c041f5c;hpb=946a01315097195bb25e1ea2b0a85ed495c822c4;p=dgit.git

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 112bc39e..f8d8091f 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -12,8 +12,6 @@ suitespecs+=' stable'
 
 t-tstunt-parsechangelog
 
-t-newtag
-
 # Easiest way to make a patches-unapplied but not-gbp tree is
 # to take the patches-unapplied tree and by-hand commit the .gitignore
 # changes as a debian patch.
@@ -29,15 +27,12 @@ want-success () {
 	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
 
 	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
-	t-$qmode-pushed-good
+	t-$qmode-pushed-good $suite
 }
 
 
 echo "===== testing tree suitable for --quilt=gbp (only) ====="
 
-t-expect-fail 'grep: new-upstream-file: No such file or directory' \
-t-dgit --quilt=dpm build-source
-
 t-expect-fail 'git tree differs from result of applying' \
 t-dgit -wgf --quilt=dpm build-source
 
@@ -137,4 +132,4 @@ t-commit dpmish-stable 1.0-6 $suite
 
 want-success dpm --new
 
-echo ok.
+t-ok