dgit: Drop an obsolete xxx comment

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9eb75371102f14e4648f8bef5d12f0d907c462db..849e3f642d5e6ae3385efab70c71421122f513c6 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -7,7 +7,8 @@ t-git-debrebase () {
        local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
        : '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-       $gdr    $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
+       $gdr "--dgit=${DGIT_TEST-dgit}" $GDR_TEST_OPTS \
+               $GDR_TEST_DEBUG $t_gdr_xopts "$@"
        : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -141,7 +142,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
 
@@ -155,21 +156,36 @@ t-gdr-good () {
 
 t-some-changes () {
        local token=$1
+       local which=${2:-dum}
+       local fsuffix=$3
 
        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$fsuffix "// debian $token"
+               git add debian/zorkmid$fsuffix
+               git commit -m "DEBIAN add zorkmid$fsuffix ($token)"
+               ;;
+       esac
 
-       echo >>src.c "// upstream $token"
-       git commit -a -m "UPSTREAM edit src.c ($token)"
+       case "$which" in
+       *u*)
+               echo >>src$fsuffix.c "// upstream $token"
+               git add src$fsuffix.c
+               git commit -m "UPSTREAM edit src$fsuffix.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$fsuffix src$fsuffix.c; do
+                       echo "// both! $token" >>$f
+                       git add $f
+               done
+               git commit -m "MIXED add both($fsuffix) ($token)"
+               ;;
+       esac
 
        t-git-next-date
 }
@@ -209,7 +225,7 @@ t-nmu-upload-2 () {
 }
 
 t-nmu-upload-3 () {
-       t-dch-commit -r sid
+       t-dch-commit-r
 
        t-dgit -wgf build-source
 
@@ -275,3 +291,14 @@ t-nmu-reconciled-good () {
        git checkout master
        t-dgit -wgf quilt-fixup
 }
+
+t-gdr-prep-new-upstream () {
+       uv=$1
+       t-git-next-date
+       git checkout make-upstream
+       git reset --hard upstream
+       t-make-new-upstream-tarball $uv
+       git push . make-upstream:upstream
+       git checkout master
+       t-git-next-date
+}