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: Use dch -r -D sid '' not dch -r sid.
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index bd06d20d21cc7364ce1e056777e5fd03e35b4b29..e06ae224b56ce409032f93c765e241b63bfe8ed7 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-41,6
+41,7
@@
export DGIT_TEST_TROOT=$troot
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
+ export DGIT_TEST_BYHAND=1
mkdir -p tests/tmp
tmpbase=$troot/tmp
tmp=tests/tmp/$testname
mkdir -p tests/tmp
tmpbase=$troot/tmp
tmp=tests/tmp/$testname
@@
-152,7
+153,7
@@
t-reporefs () {
exec >"$outputfile"
if test -d $whichrepo; then
cd $whichrepo
exec >"$outputfile"
if test -d $whichrepo; then
cd $whichrepo
- git show-ref |sort
+ git show-ref |
t-
sort
fi)
}
fi)
}
@@
-1005,6
+1006,16
@@
t-commit () {
revision=$(( ${revision-0} + 1 ))
}
revision=$(( ${revision-0} + 1 ))
}
+t-dch-r-rune () {
+ local cmd="$1"; shift
+ local suite=${1-unstable}
+ $cmd -r -D "$suite" ''
+}
+
+t-dch-commit-r () {
+ t-dch-r-rune t-dch-commit "$@"
+}
+
t-dch-commit () {
faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
git commit -m "dch $*" debian/changelog
t-dch-commit () {
faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
git commit -m "dch $*" debian/changelog
@@
-1134,7
+1145,11
@@
t-alt-test () {
t-git-config dgit.default.old-dsc-distro test-dummy
t-git-config dgit.default.old-dsc-distro test-dummy
-case "$0" in
-*/gnupg) ;;
-*) t-setup-import gnupg ;;
-esac
+for import in ${autoimport-gnupg}; do
+ case "$0" in
+ */$import) ;;
+ *)
+ t-setup-import $import
+ ;;
+ esac
+done