summaryrefslogtreecommitdiff
path: root/tests/lib-gdr
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 13:31:58 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 15:36:23 +0100
commitd5a58eb3a50f0df4a764d9aa301f3f130c4b2465 (patch)
tree73450b1988471de998d185abf89c3b49e7c5d971 /tests/lib-gdr
parent0d821f5b266626e266c59522017f6d9e714d89c3 (diff)
test suite: lib-gdr: t-gdr-good: Handle MergedBreakwaters
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-gdr')
-rw-r--r--tests/lib-gdr19
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr
index 6c74465..9d9fcb4 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
}