X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=dbceb42e8089eb28e2cb0810f39565d8d27e3c20;hp=93997c67bec6e61c0be8ca1b6f102cd0aaed8aa3;hb=2a2b0931f9b29bf372136451d317eb81649424e2;hpb=ac57e4c973a8a5a93e6fbb258908b429babd5bae

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 93997c67..dbceb42e 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
 
@@ -38,6 +39,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
@@ -56,12 +79,31 @@ bm-guess-e-source-e-targets () {
 	esac
 }
 
+bm-quirk-sbuild-after-act () {
+	# sbuild likes to run the package clean target in the chroot,
+	# which isn't necessary in our case.  We don't disable it in
+	# dgit because we want to do what sbuild does, in case there
+	# are packages which don't build unless their clean target was
+	# 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; 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 &/;
+		' <$sblog >>$bmlog
+	else
+		echo "SBUILD LOG FILE ($sblog) MISSING"
+	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
 }
 
@@ -79,7 +121,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' ;;
@@ -101,7 +167,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>&-
 }
@@ -112,6 +180,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
@@ -123,7 +193,7 @@ bm-run-one () {
 	git checkout $branch
 	git clean -xdf # since we might not do any actual cleaning
 
-	dsc='../example_1.0.dsc'
+	dsc="$bpd/example_$v.dsc"
 	rm -f $dsc
 
 	set +o pipefail
@@ -151,7 +221,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 $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>&-
 
@@ -169,9 +252,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
 }