From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Jul 2015 11:32:41 +0000 (+0100)
Subject: Test suite: build-modes tests: Do extra clean mode tests with build-source
X-Git-Tag: debian/1.1~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=38491289c0b4046012789f87fc12d57890531844

Test suite: build-modes tests: Do extra clean mode tests with build-source
---

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5daf3bf5..879bc016 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -26,6 +26,10 @@ END
 	else
 			dpkgbuildpackage_deps_for_clean=false
 	fi
+
+	cleanmodes_default="git none dpkg-source dpkg-source-d"
+	cleanmodes_all="$cleanmodes_default git-ff check"
+	cleanmodes="$cleanmodes_default"
 }
 
 bm-guess-e-source-e-targets () {
@@ -144,8 +148,7 @@ bm-run-one () {
 }
 
 bm-act-iterate () {
-	for cleanmode in git none dpkg-source dpkg-source-d; do
-	# git-ff check removed because they're really very similar
+	for cleanmode in $cleanmodes; do
 		for branch in indep-arch bad-build-deps; do
 			bm-run-one
 		done
diff --git a/tests/tests/build-modes b/tests/tests/build-modes
index f01bc990..a8c5d5cf 100755
--- a/tests/tests/build-modes
+++ b/tests/tests/build-modes
@@ -17,7 +17,14 @@ for act in					\
 	bm-guess-e-source-e-targets "$act"
 
 	case $act in
-	build-source)	e_source=true;	e_targets=''			;;
+	build-source)
+		e_source=true
+		e_targets=''
+		cleanmodes="$cleanmodes_all"
+		;;
+	*)
+		cleanmodes="$cleanmodes_default"
+		;;
 	esac
 
 	real_act="$act"