git-playtree-setup: Rename from git-playtree-create

[dgit.git] / tests / lib-core

diff --git a/tests/lib-core b/tests/lib-core
index e2b6c0623d6b423301ed7eee59f57ac80bb00d9b..7e98acfbe07c3dea16dae1e6b1ed4ecef0d17681 100644 (file)
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -11,12 +11,14 @@ t-set-intree () {
        : ${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/}}
        : ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
        : ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
+       : ${DEBPUSH_GIT_PLAYTREE_SETUP:=$DGIT_TEST_INTREE/git-playtree-setup}
        export DGIT_TEST DGIT_BADCOMMIT_FIXUP
        export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
-       export DGIT_MANPAGES_SOURCE_DIR
+       export DGIT_MANPAGES_SOURCE_DIR DEBPUSH_GIT_PLAYTREE_SETUP
        export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
 }
 
@@ -25,8 +27,9 @@ 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
 }
 
@@ -40,3 +43,7 @@ t-filter-out-git-hyphen-dir () {
        path="${path%:}"
        PATH="$path"
 }
+
+t-sort () {
+       LC_COLLATE=C sort "$@"
+}