X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=e2496b43a0355d45f67fc345622df66705c8de33;hb=c57fd0c0dac97a1a3c683e479cc2d4d0fdc89060;hp=564ea512a6b0fd61a913d39618e3fe97e5cd7d84;hpb=3a3ec0b3ff3408922f4740d83fa291d6d30adf45;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 564ea512..e2496b43 100644
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 export DGIT_TEST_TROOT=$troot
+bpd=..
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -674,6 +675,12 @@ t-push-was-source-only () {
         done
 }
 
+t-push-included () {
+    for f in $@; do
+        stat $tmp/incoming/$f
+    done
+}
+
 t-pushed-good () {
 	local branch=$1
 	local suite=${2:-sid}
@@ -701,6 +708,12 @@ t-pushed-good-core () {
 	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
@@ -1012,6 +1025,18 @@ t-make-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}
@@ -1134,8 +1159,13 @@ t-policy-periodic () {
 }
 
 t-buildproductsdir-config () {
-	t-git-config dgit.default.build-products-dir $tmp/bpd
-	mkdir -p $tmp/bpd
+	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 () {