Test suite: Replace assignments to p with t-select-package

diff --git a/tests/lib b/tests/lib
index fbe04b7d8d91a9c63728411a4f1431dfccf70261..ebfe5a788bdc3f41f45c31c36cba0c137b3a1c54 100644 (file)
--- 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 c702c370b914c749e6ac9608247fae6a5d32b7f2..452fa40e0fe56f23e3de48f53f689e2a69411afe 100755 (executable)
--- 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 3ce1447a9834e3dbcfc73911b117ff72f4c13e09..37828908a45e3997b3a5a3b6c8e5a101399384ae 100755 (executable)
--- 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