X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-build-modes;h=a0b47222362ca1c443e875d3fe4ade58d40a44b9;hb=312eeea6721530096c252d25f325762e96880cdb;hp=5daf3bf57bb56186d4e8e22f3de43671f1467197;hpb=ef183550b7acfe69e8f615f5234e3014a36fbedc;p=dgit.git

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5daf3bf5..a0b47222 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -26,6 +26,10 @@ END
 	else
 			dpkgbuildpackage_deps_for_clean=false
 	fi
+
+	cleanmodes_default="git none dpkg-source dpkg-source-d"
+	cleanmodes_all="$cleanmodes_default git-ff check"
+	cleanmodes="$cleanmodes_default"
 }
 
 bm-guess-e-source-e-targets () {
@@ -36,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
 }
@@ -105,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
 
@@ -144,8 +151,7 @@ bm-run-one () {
 }
 
 bm-act-iterate () {
-	for cleanmode in git none dpkg-source dpkg-source-d; do
-	# git-ff check removed because they're really very similar
+	for cleanmode in $cleanmodes; do
 		for branch in indep-arch bad-build-deps; do
 			bm-run-one
 		done