X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=c3d636781ae0b33e7135e9a52a7f328c3a1d2ec2;hp=cdf223d63e903eec1af8767e990cea32ba5ecb9a;hb=0f74d9d90bbb3284dbbb3cca306607667aa9e94c;hpb=627a025403c21c87c4a56135c4b05810104507da

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index cdf223d6..c3d63678 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -1,4 +1,17 @@
 
+bm-prep-ownpackage-branches () {
+	cat <<'END' >$tmp/stunt-git
+#!/bin/sh -e
+case "$*" in
+*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
+esac
+exec git "$@"
+END
+	chmod +x $tmp/stunt-git
+
+	bm_branches="$1"
+}
+
 bm-prep () {
 	t-tstunt-parsechangelog
 
@@ -11,14 +24,7 @@ bm-prep () {
 		-i debian/control
 	git commit -a -m bad-build-deps
 
-	cat <<'END' >$tmp/stunt-git
-#!/bin/sh -e
-case "$*" in
-*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
-esac
-exec git "$@"
-END
-	chmod +x $tmp/stunt-git
+	bm-prep-ownpackage-branches 'indep-arch bad-build-deps'
 
 	if zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' \
 		/usr/share/doc/dpkg-dev/changelog.gz; then
@@ -40,6 +46,8 @@ bm-guess-e-source-e-targets () {
 	*" -A")	e_source=false;	e_targets='build-indep binary-indep'	;;
 	*" -S")	e_source=true;	e_targets=' '				;;
 	*" -F")	e_source=true;	e_targets='build binary'		;;
+	*" -G")	e_source=true;	e_targets='build-arch binary-arch'	;;
+	*" -g")	e_source=true;	e_targets='build-indep binary-indep'	;;
 	*)	e_source=true;	e_targets='build binary'		;;
 	esac
 }
@@ -55,8 +63,8 @@ bm-report-source () {
 
 bm-build-deps-ok () {
 	case "$branch" in
-	indep-arch)		return 0	;;
-	bad-build-deps)		return 1	;;
+	*bad-build-deps*)	return 1	;;
+	*)			return 0	;;
 	esac
 }
 
@@ -95,7 +103,7 @@ bm-compute-expected () {
 }
 
 bm-run-one () {
-	local args="--clean=$cleanmode $real_act"
+	local args="$DGIT_TEST_BM_BASEARGS --clean=$cleanmode $real_act"
 
 	bmid="$act,$cleanmode,$branch"
 	bmid=${bmid// /_}
@@ -115,7 +123,7 @@ bm-run-one () {
 	rm -f $dsc
 
 	set +o pipefail
-	t-dgit --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
+	t-dgit --rm-old-changes --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
 	local ps="${PIPESTATUS[*]}"
 	set -o pipefail
 
@@ -150,9 +158,16 @@ bm-run-one () {
 
 bm-act-iterate () {
 	for cleanmode in $cleanmodes; do
-		for branch in indep-arch bad-build-deps; do
+		for branch in $bm_branches; do
 			bm-run-one
 		done
 	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}"
+}