summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-06 23:23:46 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-07 11:18:17 +0100
commit5b779fb105d7059dbb4fe63d97c2675bf7c40802 (patch)
tree1ffcdabf54ba8060daba3010dbcdec5b3a6a4200 /tests
parent5986d81a14f60f14ee2d31967be1bc2f6ba6cc7a (diff)
test suite: t-tagupl-run-drs: New source parameter
Change all callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib5
-rwxr-xr-xtests/tests/tagupl6
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/lib b/tests/lib
index 39f1382..c37c512 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1212,11 +1212,12 @@ t-tagupl-settings () {
}
t-tagupl-run-drs () {
+ local source=$1
cd ..
cd tagupl
DGIT_DRS_ANY_URL=1 \
- DGIT_DRS_MODE="tag2upload $tmp/$p $tagname" \
+ DGIT_DRS_MODE="tag2upload $source $tagname" \
$troot/drs-git-ext
cd $tmp/$p
@@ -1227,7 +1228,7 @@ t-tagupl-test () {
--distro=test-dummy -u Senatus "$@"
mkdir ../tagupl
- t-tagupl-run-drs
+ t-tagupl-run-drs $tmp/$p
t-dgit fetch
t-pushed-good master
diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index cfbdb6e..c9c47b3 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -62,7 +62,7 @@ with-mangled () {
perl <../basetag >../badtag-$ident -pe "$perl"
git tag -u Senatus -f -s -m "$(cat ../badtag-$ident)" "$tagname"
- t-tagupl-run-drs
+ t-tagupl-run-drs $tmp/$p
}
expect-quit () {
@@ -86,12 +86,12 @@ expect-email () {
raw-mangled () {
git update-ref refs/tags/$tagname \
$(git hash-object -w -t tag ../tagobj-$ident)
- t-tagupl-run-drs
+ t-tagupl-run-drs $tmp/$p
}
tagname=test-dummy/1.2
t-expect-fail E:'failed command: git fetch' \
-t-tagupl-run-drs
+t-tagupl-run-drs $tmp/$p
tagname=splorf/$v ; expect-quit baddistro '' 'tag name not for us'
tagname=test-dummy/1,2; expect-quit badver '' 'tag name not for us'