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 lib: add t-buildproductsdir-config
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 4ef275ca1641f62804675c91ab1cf516b66d5692..564ea512a6b0fd61a913d39618e3fe97e5cd7d84 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-17,6
+17,8
@@
funcs: ${FUNCNAME[*]}
lines: ${BASH_LINENO[*]}
files: ${BASH_SOURCE[*]}
END
lines: ${BASH_LINENO[*]}
files: ${BASH_SOURCE[*]}
END
+ t-save-artifacts
+
exit 16
}
exit 16
}
@@
-62,6
+64,7
@@
env -0 >$tmp/.save-env
ln -f $troot/ssh ssh
export DEBCHANGE_VENDOR=dpkg
ln -f $troot/ssh ssh
export DEBCHANGE_VENDOR=dpkg
+unset VISUAL
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
@@
-71,6
+74,9
@@
incoming = $tmp/incoming
run_dinstall = 0
END
run_dinstall = 0
END
+schroot=${DGIT_SCHROOT_CHROOT:-build}
+# Pretty much any Debian sid snapshot schroot will do.
+
: ${t_archive_method:=aq}
: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
: ${t_archive_method:=aq}
: ${tagpfx:=archive/test-dummy}
: ${suitespecs:=sid:unstable}
@@
-409,9
+415,18
@@
t-fscks () {
t-ok () {
: '========================================'
t-fscks
t-ok () {
: '========================================'
t-fscks
+ t-save-artifacts
echo ok.
}
echo ok.
}
+t-save-artifacts () {
+ artifacts="$AUTOPKGTEST_ARTIFACTS"
+ if [ x"$artifacts" = x ]; then return; fi
+ if [ x"tmp" = x ]; then return; fi
+ GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
+ --exclude=\*.tar .
+}
+
t-rm-dput-dropping () {
rm -f $tmp/${p}_${v}_*.upload
}
t-rm-dput-dropping () {
rm -f $tmp/${p}_${v}_*.upload
}
@@
-1006,6
+1021,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
@@
-1108,6
+1133,11
@@
t-policy-periodic () {
: '))))))))))))))))))))))))))))))))))))))))'
}
: '))))))))))))))))))))))))))))))))))))))))'
}
+t-buildproductsdir-config () {
+ t-git-config dgit.default.build-products-dir $tmp/bpd
+ mkdir -p $tmp/bpd
+}
+
t-restrict () {
local restriction=$1
(cd $root; t-restriction-$restriction >&2)
t-restrict () {
local restriction=$1
(cd $root; t-restriction-$restriction >&2)