summaryrefslogtreecommitdiff
path: root/tests/tests/inarchivecopy
diff options
context:
space:
mode:
Diffstat (limited to 'tests/tests/inarchivecopy')
-rwxr-xr-xtests/tests/inarchivecopy13
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