X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-core;h=bdf3a6c350d95c57272b7c7de438d097ddb70551;hb=e81d32c1f0c1f8e955917aa29161da92fa1c9ab9;hp=7ed27619ac3466b9a2900519412a53006cb709ad;hpb=2c3427f71978357151e84611d967c1650aa814dc;p=dgit.git

diff --git a/tests/lib-core b/tests/lib-core
index 7ed27619..bdf3a6c3 100644
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -8,10 +8,16 @@ fail () {
 t-set-intree () {
 	if [ "x$DGIT_TEST_INTREE" = x ]; then return; fi
 	: ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
+	: ${DGIT_BADCOMMIT_FIXUP:=$DGIT_TEST_INTREE/dgit-badcommit-fixup}
 	: ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/infra/dgit-repos-server}
 	: ${DGIT_SSH_DISPATCH_TEST:=$DGIT_TEST_INTREE/infra/dgit-ssh-dispatch}
+	: ${DGIT_DEBPUSH_TEST:=$DGIT_TEST_INTREE/git-debpush}
 	: ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
-	export DGIT_TEST DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
+	: ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
+	: ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
+	export DGIT_TEST DGIT_BADCOMMIT_FIXUP
+	export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
+	export DGIT_MANPAGES_SOURCE_DIR
 	export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
 }
 
@@ -20,12 +26,14 @@ t-set-using-tmp () {
 	export DGIT_TEST_DUMMY_DIR=$tmp
 	export DGIT_TEST_TMP=$tmp
 	export GNUPGHOME=$tmp/nonexistent
+	export DEBFULLNAME='dgit test git user'
 	git config --global user.email 'dgit-test@debian.example.net'
-	git config --global user.name 'dgit test git user'
+	git config --global user.name "$DEBFULLNAME"
+	git config --global protocol.ext.allow always
 }
 
 t-filter-out-git-hyphen-dir () {
-	local pathent=$(type -p git-rev-parse ||:)
+	local pathent; pathent=$(type -p git-rev-parse ||:)
 	case "$pathent" in '') return ;; esac
 	pathent=${pathent%/*}
 	local path=":$PATH:"
@@ -34,3 +42,7 @@ t-filter-out-git-hyphen-dir () {
 	path="${path%:}"
 	PATH="$path"
 }
+
+t-sort () {
+	LC_COLLATE=C sort "$@"
+}