X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-subcommands;h=e59fc07aaeab6ada1e0a510e3be9ff8b3027d299;hp=123a0d9f5f20a997559977a43b5380ed17bd5657;hb=244a7da76c07975d807da32de824ab3e3ee55478;hpb=1951e44b06b3e179b508bcd139d8758c250e35e2

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 123a0d9f..e59fc07a 100755
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 
@@ -16,7 +16,8 @@ mix-it () {
 	local m=$(git symbolic-ref HEAD)
 	t-some-changes "subcommands $m 1"
 
-	t-dgit -wgf quilt-fixup
+	# we want patches mde by dgit, not gdr, for our test cases
+	t-dgit --git-debrebase=true -wgf quilt-fixup
 	t-git-next-date
 
 	t-some-changes "subcommands $m 2"
@@ -69,11 +70,27 @@ subcmd () {
 		XX*)
 			fail "$checkletters" # for debugging
 			;;
+		esac
+
+		case "$checkletters" in
+		X*)
+			t-expect-fail E:'snags: [0-9]* blockers' \
+			t-git-debrebase $xopts $subcmd
+			xopts+=' --force'
+			next_checkletter
+			;;
+		esac
+
+		case "$checkletters" in
 		N*)
 			t-expect-fail E:. \
 			t-git-debrebase $xopts $subcmd
-			t-git-debrebase $xopts --noop-ok $subcmd
+			xopts+=' --noop-ok'
+			next_checkletter
 			;;
+		esac
+
+		case "$checkletters" in
 		[EF]:*)
 			t-expect-fail "$checkletters" \
 			t-git-debrebase $xopts $subcmd
@@ -184,6 +201,7 @@ subcmd	make-patches	sPft	"$Ep"	uPft	"$Ep"
 #   E:$pat	} this is an error (must come first)
 #   F:$pat	} arg is passed to expect-fail
 #
+#   X		should fail due to snags, but succeed when forced
 #   XX		crash out of script for manual debugging
 #
 #   N		this is a noop, error unless --noop-ok