X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-build-modes;h=5e186b2698ece154ed68a9be7bc0d6cc7e8e5da9;hb=d98b7653e23426cdfe91f6892c2a2f1c21481cd0;hp=115ee71e2809def42885255cab10267fdb21ecb2;hpb=8c2e4856765c53a94b4195eddc1ac446b996e709;p=dgit.git

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 115ee71e..5e186b26 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -14,6 +14,7 @@ END
 
 bm-prep () {
 	t-tstunt-parsechangelog
+	t-tstunt dpkg-deb
 
 	t-prep-newpackage example 1.0
 
@@ -126,17 +127,17 @@ bm-compute-expected () {
 	*[^\ ]*)
 		;;
 	*)
-		# dgit won't bother cleaning the tree
-		# if no build is going to be run
-		eff_cleanmode=none
+		# if no build is going to be run, dgit will only check
+		# cleanliness rather than actually cleaning
+		eff_cleanmode=C$cleanmode
 		;;
 	esac
 
 	case "$act" in
 	sbuild*)
-		# dgit sbuild won't bother cleaning the tree
+		# dgit sbuild will only check cleanliness
 		# because it doesn't need to to make a .dsc for sbuild
-		eff_cleanmode=none
+		eff_cleanmode=C$cleanmode
 		;;
 	esac
 
@@ -147,12 +148,13 @@ bm-compute-expected () {
 	case $eff_cleanmode in
 	git)		echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
 	git-ff)		echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
-	check)		echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
+	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
 			echo >&4 "EXAMPLE RULES TARGET clean"
 			;;
 	none)		;;
+	C*)		echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
 	*)		fail "t-compute-expected-run $cleanmode ??" ;;
 	esac