chiark / gitweb /
Test suite: add component "main" to synthesised mirror filenames
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 15 Apr 2015 20:27:39 +0000 (21:27 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 31 May 2015 10:54:05 +0000 (11:54 +0100)
tests/lib

index 29812f7..5caa4c3 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -85,30 +85,30 @@ t-has-ancestor () {
 
 t-archive-none () {
        p=$1
-       mkdir -p $tmp/aq $tmp/mirror
+       mkdir -p $tmp/aq $tmp/mirror/main
        echo sid >$tmp/aq/suite.unstable
 }
 
 t-archive-process-incoming () {
-       mv incoming/${p}_${v}[._]* mirror/
+       mv incoming/${p}_${v}[._]* mirror/main/
        t-archive-query
 }
 
 t-archive-query () {
        local dscf=${p}_${v}.dsc
-       echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+       echo "${v} main/$dscf" >>$tmp/aq/package.sid.${p}
 }
 
 t-archive () {
        t-archive-none $1
        v=$2
        local dscf=${p}_$2.dsc
-       rm -f $tmp/mirror/${p}_*
-       ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
+       rm -f $tmp/mirror/main/${p}_*
+       ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/main/
        t-archive-query
        rm -rf $tmp/extract
        mkdir $tmp/extract
-       (set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
+       (set -e; cd $tmp/extract; dpkg-source -x ../mirror/main/$dscf)
 }
 
 t-dgit () {