X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=837dde0c88e17fccfdd38f533693a842885cfff3;hp=6c0908f2fc1f22ca48260f956ba166a5d7cbbd16;hb=79514d6b2708624a62c0e72c2ff0565682b310bf;hpb=2dad19e4009076b58c0775392d80386a00668943

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 6c0908f2..837dde0c 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -34,7 +34,9 @@ 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="$cleanmodes_default"
 }
@@ -47,7 +49,7 @@ bm-gbp-example-acts () {
 
 	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"
@@ -149,18 +151,28 @@ bm-compute-expected () {
 	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 -dn -x' ;;
-	dpkg-source-d)
+	dpkg-source-d|dpkg-source-d,no-check)
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
-	dpkg-source)
+	dpkg-source|dpkg-source,no-check)
 			bm-build-deps-ok || tolerate_fail=tolerate
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
 	none)		;;
+	Cdpkg-source*)	;; # handled below
 	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
 	*)		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