X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=3bb1bf3f8d5f7e3fd4682c07704ec38d922bff86;hp=00f3a0347433c39a11ba3a81ac1c10198369e755;hb=75ca716a6e0a737795ab552a830ee277f8fda56c;hpb=4e73f0c77e0a5c679a39c5e78f67adbb217d5922

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 00f3a034..3bb1bf3f 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -86,8 +86,8 @@ 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 sblog=../example_${v}_$arch.build
+	local arch; arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
+	local sblog=$bpd/example_${v}_$arch.build
 	if [ -e $sblog ]; then
 		sed '
 			s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/;
@@ -120,7 +120,31 @@ bm-compute-expected () {
 	exec 4>$bmexp
 	echo >&4 "$heading"
 
-	case $cleanmode in
+	local eff_cleanmode=$cleanmode
+
+	case "$e_targets" in
+	*[^\ ]*)
+		;;
+	*)
+		# dgit won't bother cleaning the tree
+		# if no build is going to be run
+		eff_cleanmode=none
+		;;
+	esac
+
+	case "$act" in
+	sbuild*)
+		# dgit sbuild won't bother cleaning the tree
+		# because it doesn't need to to make a .dsc for sbuild
+		eff_cleanmode=none
+		;;
+	esac
+
+	# we are running the builder in-tree ?
+	# when we have --include-dirty, we will want to check
+	# that too and reset eff_cleanmode to $cleanmode
+
+	case $eff_cleanmode in
 	git)		echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
 	git-ff)		echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
 	check)		echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
@@ -143,6 +167,8 @@ bm-compute-expected () {
 	done
 
 	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>&-
 }
@@ -153,6 +179,8 @@ bm-run-one () {
 	bmid="$act,$cleanmode,$branch"
 	bmid=${bmid// /_}
 
+	rm -f $bpd/${p}_{v}_*.changes
+
 	heading="===== [$bmid] dgit $args ====="
 
 	bmlog=$tmp/run.$bmid.output
@@ -164,7 +192,7 @@ bm-run-one () {
 	git checkout $branch
 	git clean -xdf # since we might not do any actual cleaning
 
-	dsc="../example_$v.dsc"
+	dsc="$bpd/example_$v.dsc"
 	rm -f $dsc
 
 	set +o pipefail
@@ -194,6 +222,19 @@ bm-run-one () {
 
 	bm-report-test "SOURCE FILE" [ -e $dsc ]
 
+	if [ $actual_status = success ]; then
+		local changes; changes=$(echo $bpd/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>&-
 
 	$bm_quirk_before_diff
@@ -209,10 +250,3 @@ bm-act-iterate () {
 	done
 	: bm-act-iterate done.
 }
-
-bm-alwayssplit () {
-	local t=${0##*/}
-	DGIT_TEST_BM_BASEARGS+=' --always-split-source-build'
-	export DGIT_TEST_BM_BASEARGS
-	t-chain-test "${t%%-asplit}"
-}