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=4b0f944f7c2f595b64dbdb2104c46600e8e678fe;hb=224c9211c06b084eb9583708860ca1fff0e456ad;hpb=e0f2481785baebd56a8082c9353071ae83c11922;ds=sidebyside

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 4b0f944f..ee2975d0 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -86,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 '
@@ -97,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
 }
 
@@ -141,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>&-
 }
@@ -152,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
@@ -191,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>&-