X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=8fa263c34448176d43c53ab424529951253e9c13;hp=879bc016d9fe286e0b4ac60aadc85995cbd8694d;hb=dfec10c836bfb4cf5bc80e0e90d6d7306442be1b;hpb=38491289c0b4046012789f87fc12d57890531844

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 879bc016..8fa263c3 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -40,6 +40,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
 }
@@ -95,7 +97,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// /_}
@@ -109,12 +111,13 @@ bm-run-one () {
 	bm-compute-expected
 
 	git checkout $branch
+	git clean -xdf # since we might not do any actual cleaning
 
 	dsc='../example_1.0.dsc'
 	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
 
@@ -155,3 +158,10 @@ 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}"
+}