diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 22:10:38 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-30 22:46:35 +0000 |
commit | 9eb48d0627f84bb57e9a81bf93bde98e2fa3fbf5 (patch) | |
tree | 37f26055782f9c3d83837bedc1058132296e1d4b | |
parent | d7a8b709fff008ddc507f497b055f2f883b733bf (diff) |
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>
-rwxr-xr-x | tests/tests/inarchivecopy | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy index c83a5d3..b6cbb12 100755 --- 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 - t-archive-updated stable $p + t-archive-updated $to $p } 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-inarchive-copy $vm + local tosuite=${2:-stable} + t-inarchive-copy $vm '' $tosuite 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 - t-dgit clone $p stable example.cloned + t-dgit clone $p $tosuite example.cloned cd example.cloned t-refs-same-start |