chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Infra: Honour archive-query-tls-curl-ca-args
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index e1bc6d941e8f66b60f1d4d5d1d089049e6da4bcc..e710f39dc660f8d1d065a3c46c08d5fb93449f19 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-34,6
+34,8
@@
mkdir -p $tmp/gnupg
cp $troot/gnupg/* $tmp/gnupg
chmod go-rw $tmp/gnupg/*
cp $troot/gnupg/* $tmp/gnupg
chmod go-rw $tmp/gnupg/*
+export DEBCHANGE_VENDOR=dpkg
+
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
[test-dummy]
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
[test-dummy]
@@
-155,7
+157,7
@@
t-prep-newpackage () {
t-git-none
t-worktree $v
cd $p
t-git-none
t-worktree $v
cd $p
- if ! git
-
show-ref --verify --quiet refs/heads/master; then
+ if ! git
show-ref --verify --quiet refs/heads/master; then
git branch -m dgit/sid master
git remote rm dgit
fi
git branch -m dgit/sid master
git remote rm dgit
fi
@@
-302,6
+304,16
@@
t-clean-on-branch () {
t-output "## $1" git status -b --porcelain
}
t-output "## $1" git status -b --porcelain
}
+t-git-get-ref-exact () {
+ local ref=$1
+ # does not dereference, unlike t-git-get-ref
+ case "$ref" in
+ refs/*) ;;
+ *) fail "t-git-get-ref-exact bad $ref" ;;
+ esac
+ git for-each-ref --format='%(objectname)' "[r]efs/${ref#refs/}"
+}
+
t-git-get-ref () {
local ref=$1
case "$ref" in
t-git-get-ref () {
local ref=$1
case "$ref" in
@@
-465,12
+477,16
@@
t-drs () {
t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
t-git-config dgit-distro.test-dummy.git-check true
t-git-config dgit-distro.test-dummy.git-create true
t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
t-git-config dgit-distro.test-dummy.git-check true
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/.
+ cp $
troot
/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+ cp $
troot
/suites $tmp/.
drs_dispatch=$tmp/distro=test-dummy
mkdir $drs_dispatch
drs_dispatch=$tmp/distro=test-dummy
mkdir $drs_dispatch
- ln -sf $root $drs_dispatch/dgit-live
+
+ if [ "x$DGIT_TEST_INTREE" != x ]; then
+ ln -sf "$DGIT_TEST_INTREE" $drs_dispatch/dgit-live
+ fi
+
ln -sf $tmp/git $drs_dispatch/repos
ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
mkdir -p $drs_dispatch/keyrings
ln -sf $tmp/git $drs_dispatch/repos
ln -sf $tmp/suites $tmp/dm.txt $drs_dispatch/
mkdir -p $drs_dispatch/keyrings
@@
-500,10
+516,18
@@
t-policy-admin () {
${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
}
${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
}
+t-policy-nonexist () {
+ ln -sf no-such-file-or-directory $drs_dispatch/policy-hook
+}
+
t-policy () {
local policyhook=$1
t-policy () {
local policyhook=$1
- ln -sf ${DGIT_INFRA_PFX}$policyhook \
- $drs_dispatch/policy-hook
+ policyhook=${DGIT_INFRA_PFX}$policyhook
+ case $policyhook in
+ */*) ;;
+ *) policyhook=`type -P $policyhook` ;;
+ esac
+ ln -sf "$policyhook" $drs_dispatch/policy-hook
}
t-debpolicy () {
}
t-debpolicy () {