chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite; convert-from-gbp: test not identical in upstream files
[dgit.git]
/
tests
/
lib-core
diff --git
a/tests/lib-core
b/tests/lib-core
index 056a1bc188c49f568df6046af46f94d2907c7f73..724c8acafbf3c21600f906c30b54fc58b5cc7a35 100644
(file)
--- a/
tests/lib-core
+++ b/
tests/lib-core
@@
-8,10
+8,15
@@
fail () {
t-set-intree () {
if [ "x$DGIT_TEST_INTREE" = x ]; then return; fi
: ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
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_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
: ${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
+ : ${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}"
}
export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
}
@@
-20,10
+25,13
@@
t-set-using-tmp () {
export DGIT_TEST_DUMMY_DIR=$tmp
export DGIT_TEST_TMP=$tmp
export GNUPGHOME=$tmp/nonexistent
export DGIT_TEST_DUMMY_DIR=$tmp
export DGIT_TEST_TMP=$tmp
export GNUPGHOME=$tmp/nonexistent
+ git config --global user.email 'dgit-test@debian.example.net'
+ git config --global user.name 'dgit test git user'
+ git config --global protocol.ext.allow always
}
t-filter-out-git-hyphen-dir () {
}
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:"
case "$pathent" in '') return ;; esac
pathent=${pathent%/*}
local path=":$PATH:"
@@
-32,3
+40,7
@@
t-filter-out-git-hyphen-dir () {
path="${path%:}"
PATH="$path"
}
path="${path%:}"
PATH="$path"
}
+
+t-sort () {
+ LC_COLLATE=C sort "$@"
+}