diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-08-05 20:32:34 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-05 13:41:48 +0100 |
commit | 0ea078ab7c20804ceb7320044a8ad2a8b8503dbe (patch) | |
tree | 945a85759fa2de2cf6a93f13a739449ff6720189 /tests | |
parent | dccb73b082268949abbc074e9fe89d6ec294fd15 (diff) |
Test suite: t-archive-none: Support multiple suites
t-archive-none now honours `suitespecs', which defaults to just
`sid:unstable'.
No overall functional change since no-one sets suitespecs to a
non-default value.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib | 40 |
1 files changed, 27 insertions, 13 deletions
@@ -63,6 +63,7 @@ run_dinstall = 0 END : ${tagpfx:=test-dummy} +: ${suitespecs:=sid:unstable} t-git-next-date () { GIT_COMMITTER_DATE="$(( ${GIT_COMMITTER_DATE%% *} + 1 )) ${GIT_COMMITTER_DATE#* }" @@ -208,30 +209,43 @@ t-prep-newpackage () { t-archive-none () { t-select-package $1 - mkdir -p $tmp/aq $tmp/mirror/pool/main + mkdir -p $tmp/aq/dsc_in_suite $tmp/mirror/pool/main - local suite=sid + : >$tmp/aq/suites + local jsondelim="[" - >$tmp/aq/package.$suite.$p - t-archive-updated $suite $p + local suitespec + for suitespec in $suitespecs; do + local suite=${suitespec%%:*} + local sname=${suitespec#*:} + + >$tmp/aq/package.$suite.$p + t-archive-updated $suite $p - >$tmp/aq/package.new.$p - t-archive-updated new $p + >$tmp/aq/package.new.$p + t-archive-updated new $p - ln -s sid $tmp/aq/dsc_in_suite/unstable - cat <<'END' >$tmp/aq/suites -[ + ln -s $suite $tmp/aq/dsc_in_suite/$sname + + cat <<END >>$tmp/aq/suites +$jsondelim { "archive" : "ftp-master", - "codename" : "sid", + "codename" : "$suite", "components" : [ "main", "contrib", "non-free" ], - "name" : "unstable", - "dakname" : "unstable" - } + "name" : "$sname", + "dakname" : "$sname" +END + + jsondelim=" }," + + done + cat <<END >>$tmp/aq/suites + } ] END } |