X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=ee2975d04c10a74cd53159aec53a0938e02548e0;hp=007eaf226b222c70815eae81c6bac558617a9f03;hb=8ac8810ed80449a437ee8bba3b9fc5457824c371;hpb=c1701e7d575aec2dc420b0f54bf648e6d3fb1938

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 007eaf22..ee2975d0 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,6 +38,28 @@ bm-prep () {
 	cleanmodes="$cleanmodes_default"
 }
 
+bm-gbp-example-acts () {
+	t-gbp-example-prep
+
+	git checkout -b for-build-modes qc/quilt-tip-2
+	# build-modes cannot cope with branches containing /
+
+	bm-prep-ownpackage-branches for-build-modes
+
+	cleanmodes='git dpkg-source'
+
+	for act in "$@"; do
+		bm-guess-e-source-e-targets "$act"
+		real_act="--quilt=gbp $act"
+		case "$act" in
+		sbuild*)    bm_quirk_after_act=bm-quirk-sbuild-after-act ;;
+		gbp-*)	    real_act="$real_act --git-ignore-branch" ;;
+		*)	    bm_quirk_after_act='' ;;
+		esac
+		bm-act-iterate
+	done
+}
+
 bm-guess-e-source-e-targets () {
 	local some_act=$1
 	case "$some_act" in
@@ -64,7 +86,7 @@ bm-quirk-sbuild-after-act () {
 	# run.  We know it must be running it in the chroot because we
 	# provide sbuild with the dsc, not the tree, so we simply
 	# ignore all executions of the clean target by schroot.
-	local arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
+	local arch; arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
 	local sblog=../example_${v}_$arch.build
 	if [ -e $sblog ]; then
 		sed '
@@ -75,11 +97,12 @@ bm-quirk-sbuild-after-act () {
 	fi
 }
 
-bm-report-source () {
+bm-report-test () {
+	local desc=$1; shift
 	if "$@"; then
-		echo >&4 "SOURCE EXISTS"
+		echo >&4 "$desc EXISTS"
 	else
-		echo >&4 "SOURCE MISSING"
+		echo >&4 "$desc MISSING"
 	fi
 }
 
@@ -119,7 +142,9 @@ bm-compute-expected () {
 		echo >&4 "EXAMPLE RULES TARGET $t"
 	done
 
-	bm-report-source $e_source
+	bm-report-test "SOURCE FILE" $e_source
+	bm-report-test "SOURCE IN CHANGES" $e_source
+	bm-report-test "DEBS IN CHANGES" expr "$e_targets" : '.*binary.*'
 
 	exec 4>&-
 }
@@ -130,6 +155,8 @@ bm-run-one () {
 	bmid="$act,$cleanmode,$branch"
 	bmid=${bmid// /_}
 
+	rm -f ../${p}_{v}_*.changes
+
 	heading="===== [$bmid] dgit $args ====="
 
 	bmlog=$tmp/run.$bmid.output
@@ -169,7 +196,20 @@ bm-run-one () {
 
 	egrep >&4 '^EXAMPLE RULES TARGET|^BUILD-MODES' $bmlog || [ $? = 1 ]
 
-	bm-report-source [ -e $dsc ]
+	bm-report-test "SOURCE FILE" [ -e $dsc ]
+
+	if [ $actual_status = success ]; then
+		local changes; changes=$(echo ../example_${v}_*.changes)
+		case "$changes" in
+		*' '*)	fail "build generated ambiguous .changes: $changes" ;;
+		esac
+
+		perl -ne 'print if m/^files:/i ... m/^\S/' \
+			<$changes >$changes.files
+
+		bm-report-test "SOURCE IN CHANGES" grep '\.dsc$' $changes.files
+		bm-report-test "DEBS IN CHANGES" grep '\.deb$' $changes.files
+	fi
 
 	exec 4>&-