X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-build-modes;h=a4482be2ed56e1c556772b363f312255f67c060d;hb=4bbb0ea95dcf9be8e26f19424ad3b5269a556783;hp=7d0d9fddcf14d18fd8ec52287c4fe1f48e17628c;hpb=bf3b5ae6ed289e7b1d43559700d1bdf3be8b38a7;p=dgit.git

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 7d0d9fdd..a4482be2 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,11 +38,13 @@ bm-prep () {
 	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"
 }
 
 bm-gbp-example-acts () {
 	t-gbp-example-prep
+	t-tstunt-parsechangelog
 
 	git checkout -b for-build-modes qc/quilt-tip-2
 	# build-modes cannot cope with branches containing /
@@ -148,8 +150,10 @@ bm-compute-expected () {
 	# 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' ;;
+	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"
@@ -158,10 +162,9 @@ bm-compute-expected () {
 			bm-build-deps-ok || tolerate_fail=tolerate
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	none)		;;
+	none|Cnone)	;;
 	Cdpkg-source*)	;; # handled below
-	Cgit|Cgit-ff)	;;
-	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
+	Cgit|Cgit-ff)	echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;;
 	*)		fail "t-compute-expected-run $cleanmode ??" ;;
 	esac