From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Aug 2018 06:44:08 +0000 (+0100)
Subject: test suite: t-some-changes: Allow control of which files are edited
X-Git-Tag: archive/debian/6.7~161
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a676bb68111e13736dd58b4d08c754d6150e359e;hp=cf4848f57b34bc2918526e8195c9ec730b11b18a

test suite: t-some-changes: Allow control of which files are edited

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 479ef414..1bb810fe 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -156,32 +156,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