Test suite: inarchivecopy: Prepare for another destination suite

Replace several hardcoded `stable'.  No functional change.

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

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index c83a5d36fffe4c6bc871e7d9454ed0b11d16533e..b6cbb129a93a5ae5603aa1718013a2ca756143f2 100755 (executable)
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -14,33 +14,34 @@ t-inarchive-copy () {
        local from=${2:-sid}
        local to=${3:-stable}
        egrep "^${vm//./\\.}" aq/package.$from.$p >>aq/package.$to.$p
        local from=${2:-sid}
        local to=${3:-stable}
        egrep "^${vm//./\\.}" aq/package.$from.$p >>aq/package.$to.$p

-       t-archive-updated stable $p
+       t-archive-updated $to $p

 }
 
 copy-check-good () {
        git diff $vtag
 }
 
 copy-check-good () {
        git diff $vtag

-       t-refs-same refs/remotes/dgit/dgit/stable
+       t-refs-same refs/remotes/dgit/dgit/$tosuite

        t-ref-head
        t-has-parent-or-is HEAD $vtag
 }
 
 copy-check () {
        local vm=$1
        t-ref-head
        t-has-parent-or-is HEAD $vtag
 }
 
 copy-check () {
        local vm=$1

-       t-inarchive-copy $vm
+       local tosuite=${2:-stable}
+       t-inarchive-copy $vm '' $tosuite

 
        vtag=$(v=$vm t-v-tag)
 
        cd $p
         t-refs-same-start
 
        vtag=$(v=$vm t-v-tag)
 
        cd $p
         t-refs-same-start

-        t-dgit fetch stable
-        git merge --ff-only dgit/dgit/stable
+        t-dgit fetch $tosuite
+        git merge --ff-only dgit/dgit/$tosuite

 
         copy-check-good
         local fetched=$(t-sametree-parent HEAD)
        cd ..
 
        rm -rf example.cloned
 
         copy-check-good
         local fetched=$(t-sametree-parent HEAD)
        cd ..
 
        rm -rf example.cloned

-       t-dgit clone $p stable example.cloned
+       t-dgit clone $p $tosuite example.cloned

 
        cd example.cloned
         t-refs-same-start
 
        cd example.cloned
         t-refs-same-start