summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-11 00:32:10 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-11 00:36:16 +0100
commitf1acf7af0d90aca442d1caaa1dbc901ff6adcfbc (patch)
tree3312d7b8787c93c7ff7ac1a7ffa54f6ffb3282bd /tests
parent6c39dbc077303454419f9b6e56155266d2ec1d4c (diff)
Test suite: Replace assignments to p with t-select-package
Diffstat (limited to 'tests')
-rw-r--r--tests/lib10
-rwxr-xr-xtests/tests/distropatches-reject2
-rwxr-xr-xtests/tests/drs-push-rejects2
3 files changed, 8 insertions, 6 deletions
diff --git a/tests/lib b/tests/lib
index fbe04b7..ebfe5a7 100644
--- a/tests/lib
+++ b/tests/lib
@@ -128,8 +128,12 @@ t-worktree () {
t-untar $troot/worktrees/${p}_$1
}
-t-git () {
+t-select-package () {
p=$1
+}
+
+t-git () {
+ t-select-package $1
v=$2
mkdir -p $tmp/git
local gs=$troot/git-srcs/${p}_$v.git
@@ -155,7 +159,7 @@ t-has-ancestor () {
}
t-prep-newpackage () {
- p=$1
+ t-select-package $1
v=$2
t-archive-none $p
t-git-none
@@ -169,7 +173,7 @@ t-prep-newpackage () {
}
t-archive-none () {
- p=$1
+ t-select-package $1
mkdir -p $tmp/aq $tmp/mirror/pool/main
local suite=sid
diff --git a/tests/tests/distropatches-reject b/tests/tests/distropatches-reject
index c702c37..452fa40 100755
--- a/tests/tests/distropatches-reject
+++ b/tests/tests/distropatches-reject
@@ -2,8 +2,6 @@
set -e
. tests/lib
-p=ruby-rails-3.2
-
t-archive ruby-rails-3.2 3.2.6-1
t-git-none
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index 3ce1447..3782890 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -5,7 +5,7 @@ set -e
t-drs
t-git-none
-p=pari-extra
+t-select-package pari-extra
t-worktree drs
cd $p