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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 115ee71e..bc8b2aa8 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
 
@@ -33,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"
 }
@@ -46,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"
@@ -126,17 +129,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,15 +150,29 @@ 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' ;;
-	dpkg-source-d)	echo >&4 "EXAMPLE RULES TARGET clean" ;;
-	dpkg-source)	bm-build-deps-ok || tolerate_fail=tolerate
+	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"
 			;;
-	none)		;;
+	dpkg-source|dpkg-source,no-check)
+			bm-build-deps-ok || tolerate_fail=tolerate
+			echo >&4 "EXAMPLE RULES TARGET clean"
+			;;
+	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