chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 6.3
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index f3fb0dab462cbac4ca0dcdb9c575ee3783a533aa..6028133a21b38bd6518e0bc7bad1471581ca25be 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
}
@@
-658,6
+675,12
@@
t-push-was-source-only () {
done
}
done
}
+t-push-included () {
+ for f in $@; do
+ stat $tmp/incoming/$f
+ done
+}
+
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
t-pushed-good () {
local branch=$1
local suite=${2:-sid}
@@
-685,6
+708,12
@@
t-pushed-good-core () {
git verify-tag `t-v-tag`
}
git verify-tag `t-v-tag`
}
+t-pushed-good-check-changes () {
+ changes_filename="$tmp/incoming/${p}_${v}_*.changes"
+ grep -E "^Distribution: $suite" $changes_filename
+ grep -E "^Version: $v" $changes_filename
+}
+
t-splitbrain-pushed-good--unpack () {
cd $tmp
rm -rf t-unpack
t-splitbrain-pushed-good--unpack () {
cd $tmp
rm -rf t-unpack
@@
-1005,6
+1034,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
+1146,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)