X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-build-modes;h=a4482be2ed56e1c556772b363f312255f67c060d;hb=e82d9492c0a63d75c96e2ebdbc93300d57927d60;hp=5e186b2698ece154ed68a9be7bc0d6cc7e8e5da9;hpb=55997f200aa0471662c0b2dfec5bd4523f42dbe7;p=dgit.git

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5e186b26..a4482be2 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -34,20 +34,24 @@ bm-prep () {
 			dpkgbuildpackage_deps_for_clean=false
 	fi
 
-	cleanmodes_default="git none dpkg-source dpkg-source-d"
+	cleanmodes_default="git none"
+	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 /
 
 	bm-prep-ownpackage-branches for-build-modes
 
-	cleanmodes='git dpkg-source'
+	cleanmodes='git dpkg-source,no-check'
 
 	for act in "$@"; do
 		bm-guess-e-source-e-targets "$act"
@@ -146,18 +150,33 @@ 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' ;;
-	check|Ccheck)	echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
-	dpkg-source-d)	echo >&4 "EXAMPLE RULES TARGET clean" ;;
-	dpkg-source)	bm-build-deps-ok || tolerate_fail=tolerate
+	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"
+			;;
+	dpkg-source|dpkg-source,no-check)
+			bm-build-deps-ok || tolerate_fail=tolerate
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	none)		;;
-	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
+	none|Cnone)	;;
+	Cdpkg-source*)	;; # handled below
+	Cgit|Cgit-ff)	echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;;
 	*)		fail "t-compute-expected-run $cleanmode ??" ;;
 	esac
 
+	case $eff_cleanmode in
+	dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d)
+			echo >&4 'BUILD-MODES PROGRAM git clean -dn'
+			;;
+	dpkg-source*,no-check|Cdpkg-source*,no-check)
+			;;
+	Cdpkg-source*)	fail "t-compute-expected-run wd $cleanmode ??" ;;
+	esac
+
 	if [ "x$e_targets" != x ]; then
 		# e_targets can be " " to mean `/may/ fail due to b-d'
 		bm-build-deps-ok || tolerate_fail=tolerate