test suite: editing a test script overrides DGIT_TESTS_PROGRESSIVE.

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 08717dd413c113cfc7eca638c2a85058de3b3b89..95d2330e17a60386b59ebd999a4f3703d5112bbb 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -47,6 +47,7 @@ t-gdr-good () {
                ;;
        stitched)       etypes=Pseudomerge-Upstream ;;
        pushed)         etypes=AddPatches-Pseudomerge-Upstream ;;
+       pushed-interop) etypes=Pseudomerge-AddPatchesInterop-Upstream ;;
        esac
 
        t-git-debrebase analyse >../anal.check
@@ -68,6 +69,7 @@ t-gdr-good () {
                Packaging/SAME)                         ;;
                Packaging/Upstream)                     ;;
                AddPatches/SAME)                        ;;
+               AddPatches/AddPatchesInterop)           ;;
                Changelog/Packaging)                    ;;
                Changelog/Upstream)                     ;;
                Upstream/SAME)                          ;;
@@ -87,6 +89,13 @@ t-gdr-good () {
                        fi
                esac
 
+               case "$cetype" in
+               AddPatchesInterop)
+                       git log -n1 --pretty=format:%B \
+                       | grep '^\[git-debrebase[ :]'
+                       ;;
+               esac
+
                case "$ctype" in
                Pseudomerge)
                        expect=${info#Contributor=}
@@ -132,7 +141,7 @@ t-gdr-good () {
                test $cnparents = $enparents
 
                local cndparents=`
-       for f in $parents; do echo $f; done | sort -u | wc -w
+       for f in $parents; do echo $f; done | t-sort -u | wc -w
                                `
                test $cndparents = $cnparents
 
@@ -146,21 +155,34 @@ t-gdr-good () {
 
 t-some-changes () {
        local token=$1
+       local which=${2-dum}
 
        t-git-next-date
 
-       echo >>debian/zorkmid "// debian $token"
-       git add debian/zorkmid
-       git commit -m "DEBIAN add zorkmid ($token)"
+       case "$which" in
+       *d*)
+               echo >>debian/zorkmid "// debian $token"
+               git add debian/zorkmid
+               git commit -m "DEBIAN add zorkmid ($token)"
+               ;;
+       esac
 
-       echo >>src.c "// upstream $token"
-       git commit -a -m "UPSTREAM edit src.c ($token)"
+       case "$which" in
+       *u*)
+               echo >>src.c "// upstream $token"
+               git commit -a -m "UPSTREAM edit src.c ($token)"
+               ;;
+       esac
 
-       for f in debian/zorkmid src.c; do
-               echo "// both! $token" >>$f
-               git add $f
-       done
-       git commit -m "MIXED add both ($token)"
+       case "$which" in
+       *m*)
+               for f in debian/zorkmid src.c; do
+                       echo "// both! $token" >>$f
+                       git add $f
+               done
+               git commit -m "MIXED add both ($token)"
+               ;;
+       esac
 
        t-git-next-date
 }
@@ -200,7 +222,7 @@ t-nmu-upload-2 () {
 }
 
 t-nmu-upload-3 () {
-       t-dch-commit -r sid
+       t-dch-commit-r
 
        t-dgit -wgf build-source