X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=0e188cca4280e83cf1f3de309198901c226b8cf7;hp=4435b55c4b72825818643e88542e03b77e87e3d7;hb=6913c854ca0f3eb901c39c74b74d7f0344318f72;hpb=f6cd040652129d18f3d7fe53b6bb62e5d0c79ec1

diff --git a/tests/lib b/tests/lib
index 4435b55c..0e188cca 100644
--- 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