X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=7b43d4f2d7a42179483c16e6be9af07dc32992f1;hb=d436b26183c219a8633f84aa39cf991fd8b6de4d;hp=7b4f0858afece955e7ce5a969001e933ee0a9b21;hpb=03234a4d7d5c99e71fb0f1447acdb2241d58c7d8;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 7b4f0858..7b43d4f2 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,7 @@ t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	$gdr	$GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+	$gdr --dgit=$DGIT_TEST $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -141,7 +141,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
 
@@ -222,7 +222,7 @@ t-nmu-upload-2 () {
 }
 
 t-nmu-upload-3 () {
-	t-dch-commit -r sid
+	t-dch-commit-r
 
 	t-dgit -wgf build-source