tests/tests/quilt: Test series quiltification

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index cccdc35dd5a6c1d2e09816360fabc1ae605ffd6e..adbd79ff587870bcd39e5443fd5e7f42f49258dc 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -5,8 +5,9 @@ set -x
 
 if [ "x$DGIT_TEST_INTREE" != x ]; then
        : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
-       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/dgit-repos-server}
-       export DGIT_TEST DGIT_REPOS_SERVER_TEST
+       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
+       : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
+       export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
 fi
 
 root=`pwd`
@@ -262,10 +263,43 @@ t-drs () {
        cp $root/tests/suites $tmp/.
 }
 
-t-drs-test () {
+t-dss () {
        t-drs
+ t-git-config dgit-distro.test-dummy.ssh "$troot/dss-ssh"
+ t-git-config dgit-distro.test-dummy.git-check ssh-cmd
+ t-git-config dgit-distro.test-dummy.git-create true
+ t-git-config dgit-distro.test-dummy.git-url \
+               "ext::$troot/dss-ssh X %S /dgit/test-dummy/repos"
+
+ t-git-config dgit-distro.test-dummy.diverts.drs /drs
+ t-git-config dgit-distro.test-dummy/drs.ssh "$troot/ssh"
+ t-git-config dgit-distro.test-dummy/drs.git-url $tmp/git
+ t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
+ t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
+
+       dss_dispatch=$tmp/dispatch-dir/distro=test-dummy
+       mkdir -p $dss_dispatch
+       ln -sf $root $dss_dispatch/dgit-live
+       ln -sf $tmp/git $dss_dispatch/repos
+       ln -sf $tmp/suites $tmp/dm.txt $dss_dispatch/
+       mkdir -p $dss_dispatch/keyrings
+       ln -sf $tmp/dd.gpg $dss_dispatch/keyrings/debian-keyring.gpg
+       ln -sf $tmp/dm.gpg $dss_dispatch/keyrings/debian-maintainers.gpg
+
+       echo 'no-such-package* drs' >$dss_dispatch/diverts
+}
+
+t-chain-test () {
+       local ct=$1
+       local d=${0%/*}
        cd $root
        export DGIT_TEST_TESTNAME="$testname"
        export ADTTMP=$tmp
-       exec "${0///drs-//}" "$@"
+       exec "$d/$ct"
+}      
+
+t-alt-test () {
+       local t=${0##*/}
+       t-${t%%-*}
+       t-chain-test "${t#*-}"
 }