summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-27 12:32:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-27 13:16:16 +0100
commit38491289c0b4046012789f87fc12d57890531844 (patch)
treee968027b507a91868c9b5680c00688566336867d
parentef183550b7acfe69e8f615f5234e3014a36fbedc (diff)
Test suite: build-modes tests: Do extra clean mode tests with build-source
-rw-r--r--tests/lib-build-modes7
-rwxr-xr-xtests/tests/build-modes9
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5daf3bf..879bc01 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 f01bc99..a8c5d5c 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"