X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib-build-modes;h=bc8b2aa8113a670072573a0d5381d1f9b671ab93;hb=0c244082ddb4b2443ccfbc1c438ead4fda1c33ca;hp=232d322e139fe983b3a730be15b7f80e717dd2f1;hpb=d2a8267aca1cc401561e0e7ac7aa9d6f3e315879;p=dgit.git

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 232d322e..bc8b2aa8 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -49,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"
@@ -151,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)		;;
-	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
+	none|Cnone)	;;
+	Cdpkg-source*)	;; # handled below
+	Cgit|Cgit-ff)	;;
 	*)		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