X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=479ef414b08238c1262201e2161cb2fd30104a47;hb=75ca716a6e0a737795ab552a830ee277f8fda56c;hp=9eb75371102f14e4648f8bef5d12f0d907c462db;hpb=4eee70a2b1710c1a8fc71fbd3cdc7064682a799c;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9eb75371..479ef414 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,8 @@ t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	$gdr	$GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+	$gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+		$GDR_TEST_DEBUG $t_gdr_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -141,7 +142,7 @@ t-gdr-good () {
 		test $cnparents = $enparents
 
 		local cndparents=`
-	for f in $parents; do echo $f; done | sort -u | wc -w
+	for f in $parents; do echo $f; done | t-sort -u | wc -w
 				`
 		test $cndparents = $cnparents
 
@@ -155,21 +156,34 @@ t-gdr-good () {
 
 t-some-changes () {
 	local token=$1
+	local which=${2-dum}
 
 	t-git-next-date
 
-	echo >>debian/zorkmid "// debian $token"
-	git add debian/zorkmid
-	git commit -m "DEBIAN add zorkmid ($token)"
+	case "$which" in
+	*d*)
+		echo >>debian/zorkmid "// debian $token"
+		git add debian/zorkmid
+		git commit -m "DEBIAN add zorkmid ($token)"
+		;;
+	esac
 
-	echo >>src.c "// upstream $token"
-	git commit -a -m "UPSTREAM edit src.c ($token)"
+	case "$which" in
+	*u*)
+		echo >>src.c "// upstream $token"
+		git commit -a -m "UPSTREAM edit src.c ($token)"
+		;;
+	esac
 
-	for f in debian/zorkmid src.c; do
-		echo "// both! $token" >>$f
-		git add $f
-	done
-	git commit -m "MIXED add both ($token)"
+	case "$which" in
+	*m*)
+		for f in debian/zorkmid src.c; do
+			echo "// both! $token" >>$f
+			git add $f
+		done
+		git commit -m "MIXED add both ($token)"
+		;;
+	esac
 
 	t-git-next-date
 }
@@ -209,7 +223,7 @@ t-nmu-upload-2 () {
 }
 
 t-nmu-upload-3 () {
-	t-dch-commit -r sid
+	t-dch-commit-r
 
 	t-dgit -wgf build-source