Tests: break out some things into lib-core (nfc)

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 87de19a0af66f70b911917e2bfa1b73841452187..0e188cca4280e83cf1f3de309198901c226b8cf7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -3,13 +3,9 @@
 exec 2>&1
 set -x
 
-if [ "x$DGIT_TEST_INTREE" != x ]; then
-       : ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
-       : ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
-       : ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
-       : ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
-       export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
-fi
+. tests/lib-core
+
+t-set-intree
 
 : ${DGIT_TEST_DEBUG:=-D}
 export DGIT_TEST_DEBUG
@@ -45,11 +41,6 @@ incoming             = $tmp/incoming
 run_dinstall           = 0
 END
 
-fail () {
-       echo >&2 "failed: $*"
-       exit 1
-}
-
 t-expect-fail () {
        local mpat="$1"; shift
        LC_MESSAGES=C "$@" 2>&1 | tee $tmp/t.output
@@ -328,6 +319,16 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-create true
        cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
        cp $root/tests/suites $tmp/.
+
+       drs_dispatch=$tmp/distro=test-dummy
+       mkdir $drs_dispatch
+       ln -sf $root $drs_dispatch/dgit-live
+       ln -sf $tmp/git $drs_dispatch/repos
+       ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
+       mkdir -p $drs_dispatch/keyrings
+       ln -sf $tmp/dd.gpg $drs_dispatch/keyrings/debian-keyring.gpg
+       ln -sf $tmp/dm.gpg $drs_dispatch/keyrings/debian-maintainers.gpg
+       ln -sf /bin/true $drs_dispatch/policy-hook
 }
 
 t-dsd () {
@@ -344,17 +345,7 @@ t-dsd () {
  t-git-config dgit-distro.test-dummy/drs.git-check ssh-cmd
  t-git-config dgit-distro.test-dummy/drs.git-create ssh-cmd
 
-       dsd_dispatch=$tmp/dispatch-dir/distro=test-dummy
-       mkdir -p $dsd_dispatch
-       ln -sf $root $dsd_dispatch/dgit-live
-       ln -sf $tmp/git $dsd_dispatch/repos
-       ln -sf $tmp/suites $tmp/dm.txt $dsd_dispatch/
-       mkdir -p $dsd_dispatch/keyrings
-       ln -sf $tmp/dd.gpg $dsd_dispatch/keyrings/debian-keyring.gpg
-       ln -sf $tmp/dm.gpg $dsd_dispatch/keyrings/debian-maintainers.gpg
-       ln -sf /bin/true $dsd_dispatch/policy-hook
-
-       echo 'no-such-package* drs' >$dsd_dispatch/diverts
+       echo 'no-such-package* drs' >$drs_dispatch/diverts
 }
 
 t-policy-admin () {
@@ -365,7 +356,7 @@ t-debpolicy () {
        t-dsd
 
        ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
-               $dsd_dispatch/policy-hook
+               $drs_dispatch/policy-hook
 
        mkdir $tmp/git
        t-policy-admin create-db