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 6c744657b6e270c86655aee777d822cdc031a695..9d9fcb461a09025a173f8dc8d23af0b5ee2a8fc5 100644 (file)
--- 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 ;;
        stitched)       etypes=Pseudomerge-Upstream ;;
        pushed)         etypes=AddPatches-Pseudomerge-Upstream ;;
        pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;

+       breakwater)     etypes=Packaging ;;

        esac
 
        anal=../anal$wsfx
        esac
 
        anal=../anal$wsfx


@@ -77,6 +78,8 @@ t-gdr-good-analyse () {
                Pseudomerge/SAME)                       ;;
                Packaging/SAME)                         ;;
                Packaging/Upstream)                     ;;
                Pseudomerge/SAME)                       ;;
                Packaging/SAME)                         ;;
                Packaging/Upstream)                     ;;

+               MergedBreakwaters/Packaging)            ;;
+               MergedBreakwaters/Upstream)             ;;

                AddPatches/SAME)                        ;;
                AddPatches/AddPatchesInterop)           ;;
                Changelog/Packaging)                    ;;
                AddPatches/SAME)                        ;;
                AddPatches/AddPatchesInterop)           ;;
                Changelog/Packaging)                    ;;


@@ -141,6 +144,9 @@ t-gdr-good-analyse () {
                Upstream/SAME)
                        git diff --quiet $expect..$cid -- ':debian'
                        ;;
                Upstream/SAME)
                        git diff --quiet $expect..$cid -- ':debian'
                        ;;

+               MergedBreakwaters)
+                       enparents=2
+                       ;;

                Anchor)
                        break
                        ;;
                Anchor)
                        break
                        ;;


@@ -159,6 +165,19 @@ t-gdr-good-analyse () {
                *)              fail 'unexpected parent' ;;
                esac
 
                *)              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
 }
 
        done
 }