chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Merges: Enable with command-line option instead of env var
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index 04d1f2dc1019fbb60c67772d5a70edf2f4327030..24ccf7e297f7dd7fc8c5c79f38265e6ecf96d60c 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,6
+40,7
@@
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
@@
-62,6
+65,8
@@
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
+unset GIT_EDITOR
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
@@
-71,6
+76,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
+417,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
}
@@
-659,6
+676,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}
@@
-686,6
+709,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
@@
-997,6
+1026,18
@@
t-make-badcommit () {
t-expect-fsck-fail $badcommit
}
t-expect-fsck-fail $badcommit
}
+t-merge-conflicted-stripping-conflict-markers () {
+ local otherbranch=$1
+ local file=$2
+
+ t-expect-fail F:"Merge conflict in $file" \
+ git merge $otherbranch
+
+ perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' "$file"
+ git add "$file"
+ git commit --no-edit
+}
+
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
t-commit () {
local msg=$1
v=${2:-${majorv:-1}.$revision}
@@
-1009,7
+1050,7
@@
t-commit () {
t-dch-r-rune () {
local cmd="$1"; shift
local suite=${1-unstable}
t-dch-r-rune () {
local cmd="$1"; shift
local suite=${1-unstable}
- $cmd -r
sid
+ $cmd -r
-D "$suite" ''
}
t-dch-commit-r () {
}
t-dch-commit-r () {
@@
-1118,6
+1159,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)