X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib-gdr;h=a13696d7581b9543628530cdc9fce7abea7076cd;hb=e7178a4a4eafad6d816a48c18c2a159f4dd3e40c;hp=7b43d4f2d7a42179483c16e6be9af07dc32992f1;hpb=69aae724c3d05a20219e5a9642e162dd65ef2fe9;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 7b43d4f2..a13696d7 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,8 @@ t-git-debrebase () {
 	local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	$gdr --dgit=$DGIT_TEST $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+	$gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+		$GDR_TEST_DEBUG $t_gdr_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -50,9 +51,10 @@ t-gdr-good () {
 	pushed-interop)	etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
 	esac
 
-	t-git-debrebase analyse >../anal.check
+	anal=../anal
+	t-git-debrebase analyse >$anal.check
 	expect=`git rev-parse HEAD`
-	exec <../anal.check
+	exec <$anal.check
 	local cid ctype info nparents
 	while read cid ctype info; do
 		: ===== $cid $ctype $info =====
@@ -107,9 +109,9 @@ t-gdr-good () {
 			: 'reject pointless pseudomerges'
 			local overwritten=${parents/$expect/}
 			overwritten=${overwritten// /}
-			t-git-debrebase analyse $overwritten >../anal.overwr
+			t-git-debrebase analyse $overwritten >$anal.overwr
 			local ocid otype oinfo
-			read <../anal.overwr ocid otype oinfo
+			read <$anal.overwr ocid otype oinfo
 			case "$otype" in
 			Pseudomerge) test "x$info" != "x$oinfo" ;;
 			esac
@@ -155,32 +157,34 @@ t-gdr-good () {
 
 t-some-changes () {
 	local token=$1
-	local which=${2-dum}
+	local which=${2:-dum}
+	local fsuffix=$3
 
 	t-git-next-date
 
 	case "$which" in
 	*d*)
-		echo >>debian/zorkmid "// debian $token"
-		git add debian/zorkmid
-		git commit -m "DEBIAN add zorkmid ($token)"
+		echo >>debian/zorkmid$fsuffix "// debian $token"
+		git add debian/zorkmid$fsuffix
+		git commit -m "DEBIAN add zorkmid$fsuffix ($token)"
 		;;
 	esac
 
 	case "$which" in
 	*u*)
-		echo >>src.c "// upstream $token"
-		git commit -a -m "UPSTREAM edit src.c ($token)"
+		echo >>src$fsuffix.c "// upstream $token"
+		git add src$fsuffix.c
+		git commit -m "UPSTREAM edit src$fsuffix.c ($token)"
 		;;
 	esac
 
 	case "$which" in
 	*m*)
-		for f in debian/zorkmid src.c; do
+		for f in debian/zorkmid$fsuffix src$fsuffix.c; do
 			echo "// both! $token" >>$f
 			git add $f
 		done
-		git commit -m "MIXED add both ($token)"
+		git commit -m "MIXED add both($fsuffix) ($token)"
 		;;
 	esac
 
@@ -288,3 +292,14 @@ t-nmu-reconciled-good () {
 	git checkout master
 	t-dgit -wgf quilt-fixup
 }
+
+t-gdr-prep-new-upstream () {
+	uv=$1
+	t-git-next-date
+	git checkout make-upstream
+	git reset --hard upstream
+	t-make-new-upstream-tarball $uv
+	git push . make-upstream:upstream
+	git checkout master
+	t-git-next-date
+}