X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-reprepro;h=0a688f655728219330cdba551d3fd78226cf5364;hb=9f4a5f045e36edddb3ffd23667a52f4ee319c675;hp=88102c89741f310b0b97730794b40cb2a16e61df;hpb=05429577db36fa4e71743f3695e03e2d19bf509e;p=dgit.git

diff --git a/tests/lib-reprepro b/tests/lib-reprepro
index 88102c89..0a688f65 100644
--- a/tests/lib-reprepro
+++ b/tests/lib-reprepro
@@ -8,11 +8,14 @@ t-reprepro () {
 }
 
 t-reprepro-cfg () {
- local etcapt=$tmp/etc-apt
- local mir=$tmp/mirror
+ local rrinst=$1
+ local rrdistro=${2:-test-dummy}
 
- t-git-config dgit-distro.test-dummy.archive-query aptget:
- t-git-config dgit-distro.test-dummy.mirror file://$mir/
+ local etcapt=$tmp/${rrinst}etc-apt
+ local mir=$tmp/${rrinst}mirror
+
+ t-git-config dgit-distro.$rrdistro.archive-query aptget:
+ t-git-config dgit-distro.$rrdistro.mirror file://$mir/
 
  mkdir $etcapt
  cat >$etcapt/conf <<END
@@ -24,20 +27,24 @@ END
  mkdir $etcapt/apt.conf.d
 }
 
-t-archive-none-reprepro () {
+t-archive-none-reprepro () { # hook called by t-archive-none
 	t-reprepro-setup
 	t-reprepro-regen
+	local rrinst=
 }
-t-archive-query-reprepro () {
+t-archive-query-reprepro () { # hook called by t-archive-query
 	local suite=$1
 	local p=$2
 	local v=$3
 	local dscf=$4
-	t-run-reprepro includedsc $suite $tmp/mirror/pool/$dscf
+	local rrinst=
+	t-reprepro-includedsc $suite $tmp/mirror/pool/$dscf "$rrinst"
 }
 
 t-reprepro-setup () {
-	local mir=$tmp/mirror
+	local rrinst=$1
+
+	local mir=$tmp/${rrinst}mirror
 	local rrc=$mir/conf
 	mkdir -p $rrc
 	mkdir -p $mir/pool/main
@@ -67,8 +74,16 @@ END
 	done
 }
 
-t-run-reprepro () {
-	local mir=$tmp/mirror
+t-reprepro-includedsc () {
+	local suite=$1
+	local dscf=$2
+	local rrinst=$3
+	t-reprepro--run includedsc $suite $dscf
+}
+
+t-reprepro--run () {
+	# caller is supposed to have set rrinst
+	local mir=$tmp/${rrinst}mirror
 	reprepro \
 		--outdir $mir \
 		--basedir $mir \
@@ -76,5 +91,7 @@ t-run-reprepro () {
 }
 
 t-reprepro-regen () {
-	t-run-reprepro export
+	local rrinst=$1
+
+	t-reprepro--run export
 }