From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Jan 2019 13:35:56 +0000 (+0000)
Subject: test suite: Test --clean-git[-ff],always
X-Git-Tag: archive/debian/8.3~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3138c37d23daef09e7bcd4627f4fca5ea77ccf3b;ds=sidebyside

test suite: Test --clean-git[-ff],always

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 8c05af6f..27c5b06c 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,6 +38,7 @@ bm-prep () {
 	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"
 }
 
@@ -148,8 +149,10 @@ 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' ;;
+	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"