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: Provide a gbp.conf which sets --export-dir to $bpd
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index bc9e8c72fdc673f77b2d97a1c55ebfaf0d081c87..8de7b8958a92865884982aa70b4c395c4208774e 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
}
@@
-38,9
+40,11
@@
root=`pwd`
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
export DGIT_TEST_TROOT=$troot
troot=$root/tests
testname="${DGIT_TEST_TESTNAME-${0##*/}}"
export DGIT_TEST_TROOT=$troot
+bpd=..
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
@@
-61,6
+65,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
@@
-70,6
+75,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}
@@
-152,7
+160,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)
}
@@
-408,9
+416,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
}
@@
-480,12
+497,12
@@
t-setup-done () {
local savedirs=$2
local importeval=$3
local savedirs=$2
local importeval=$3
- local import=IMPORT.${
0##*/
}
+ local import=IMPORT.${
DGIT_TEST_TESTNAME-${0##*/}
}
exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
- perl >&4 -
I.
-MDebian::Dgit -e '
+ perl >&4 -
"I$root"
-MDebian::Dgit -e '
printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
@@
-1005,6
+1022,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
@@
-1107,6
+1134,16
@@
t-policy-periodic () {
: '))))))))))))))))))))))))))))))))))))))))'
}
: '))))))))))))))))))))))))))))))))))))))))'
}
+t-buildproductsdir-config () {
+ bpd=$tmp/bpd
+ t-git-config dgit.default.build-products-dir $bpd
+ mkdir -p $bpd
+ cat <<END >>$tmp/.gbp.conf
+[buildpackage]
+export-dir = $bpd
+END
+}
+
t-restrict () {
local restriction=$1
(cd $root; t-restriction-$restriction >&2)
t-restrict () {
local restriction=$1
(cd $root; t-restriction-$restriction >&2)
@@
-1134,7
+1171,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