X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=27c5b06ca6abc5f1f9fde4488ee309b9f40f5953;hp=00f3a0347433c39a11ba3a81ac1c10198369e755;hb=3138c37d23daef09e7bcd4627f4fca5ea77ccf3b;hpb=4e73f0c77e0a5c679a39c5e78f67adbb217d5922

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 00f3a034..27c5b06c 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -14,6 +14,7 @@ END
 
 bm-prep () {
 	t-tstunt-parsechangelog
+	t-tstunt dpkg-deb
 
 	t-prep-newpackage example 1.0
 
@@ -33,8 +34,11 @@ bm-prep () {
 			dpkgbuildpackage_deps_for_clean=false
 	fi
 
-	cleanmodes_default="git none dpkg-source dpkg-source-d"
+	cleanmodes_default="git none"
+	cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra"
+	cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra"
 	cleanmodes_all="$cleanmodes_default git-ff check"
+	cleanmodes_all+=" git,always git,always"
 	cleanmodes="$cleanmodes_default"
 }
 
@@ -46,7 +50,7 @@ bm-gbp-example-acts () {
 
 	bm-prep-ownpackage-branches for-build-modes
 
-	cleanmodes='git dpkg-source'
+	cleanmodes='git dpkg-source,no-check'
 
 	for act in "$@"; do
 		bm-guess-e-source-e-targets "$act"
@@ -86,8 +90,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,18 +124,58 @@ bm-compute-expected () {
 	exec 4>$bmexp
 	echo >&4 "$heading"
 
-	case $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' ;;
-	dpkg-source-d)	echo >&4 "EXAMPLE RULES TARGET clean" ;;
-	dpkg-source)	bm-build-deps-ok || tolerate_fail=tolerate
+	local eff_cleanmode=$cleanmode
+
+	case "$e_targets" in
+	*[^\ ]*)
+		;;
+	*)
+		# if no build is going to be run, dgit will only check
+		# cleanliness rather than actually cleaning
+		eff_cleanmode=C$cleanmode
+		;;
+	esac
+
+	case "$act" in
+	sbuild*)
+		# dgit sbuild will only check cleanliness
+		# because it doesn't need to to make a .dsc for sbuild
+		eff_cleanmode=C$cleanmode
+		;;
+	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|Cgit,always)
+			echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
+	git-ff|Cgit-ff,always)
+			echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
+	check|Ccheck)	echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
+	dpkg-source-d|dpkg-source-d,no-check)
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	none)		;;
+	dpkg-source|dpkg-source,no-check)
+			bm-build-deps-ok || tolerate_fail=tolerate
+			echo >&4 "EXAMPLE RULES TARGET clean"
+			;;
+	none|Cnone)	;;
+	Cdpkg-source*)	;; # handled below
+	Cgit|Cgit-ff)	echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;;
 	*)		fail "t-compute-expected-run $cleanmode ??" ;;
 	esac
 
+	case $eff_cleanmode in
+	dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d)
+			echo >&4 'BUILD-MODES PROGRAM git clean -dn'
+			;;
+	dpkg-source*,no-check|Cdpkg-source*,no-check)
+			;;
+	Cdpkg-source*)	fail "t-compute-expected-run wd $cleanmode ??" ;;
+	esac
+
 	if [ "x$e_targets" != x ]; then
 		# e_targets can be " " to mean `/may/ fail due to b-d'
 		bm-build-deps-ok || tolerate_fail=tolerate
@@ -143,6 +187,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 +199,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 +212,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 +242,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
@@ -210,9 +271,6 @@ bm-act-iterate () {
 	: 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}"
+bm-buildproductsdir-nonworking () {
+	t-git-config dgit.default.build-products-dir ../bpd-dummy
 }