From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 12:31:58 +0000 (+0100)
Subject: test suite: lib-gdr: t-gdr-good: Handle MergedBreakwaters
X-Git-Tag: archive/debian/6.7~123
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d5a58eb3a50f0df4a764d9aa301f3f130c4b2465;ds=sidebyside

test suite: lib-gdr: t-gdr-good: Handle MergedBreakwaters

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 6c744657..9d9fcb46 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -56,6 +56,7 @@ t-gdr-good-analyse () {
 	stitched)	etypes=Pseudomerge-Upstream ;;
 	pushed)		etypes=AddPatches-Pseudomerge-Upstream ;;
 	pushed-interop)	etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
+	breakwater)	etypes=Packaging ;;
 	esac
 
 	anal=../anal$wsfx
@@ -77,6 +78,8 @@ t-gdr-good-analyse () {
 		Pseudomerge/SAME)			;;
 		Packaging/SAME)				;;
 		Packaging/Upstream)			;;
+		MergedBreakwaters/Packaging)		;;
+		MergedBreakwaters/Upstream)		;;
 		AddPatches/SAME)			;;
 		AddPatches/AddPatchesInterop)		;;
 		Changelog/Packaging)			;;
@@ -141,6 +144,9 @@ t-gdr-good-analyse () {
 		Upstream/SAME)
 			git diff --quiet $expect..$cid -- ':debian'
 			;;
+		MergedBreakwaters)
+			enparents=2
+			;;
 		Anchor)
 			break
 			;;
@@ -159,6 +165,19 @@ t-gdr-good-analyse () {
 		*)		fail 'unexpected parent' ;;
 		esac
 
+		case "$ctype" in
+		MergedBreakwaters)
+			local f
+			local parent_ix=0
+			for f in $parents; do
+				t-gdr-good-analyse $f breakwater \
+					$wsfx-mp$parent_ix
+				parent_ix=$(( $parent_ix + 1 ))
+			done
+			return
+			;;
+		esac		
+
 	done
 }