Split brain: Include debian/tests/control in fake dsc

[dgit.git] / tests / lib-build-modes

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 5daf3bf57bb56186d4e8e22f3de43671f1467197..8fa263c34448176d43c53ab424529951253e9c13 100644 (file)
--- 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 () {
@@ -36,6 +40,8 @@ bm-guess-e-source-e-targets () {
        *" -A") e_source=false; e_targets='build-indep binary-indep'    ;;
        *" -S") e_source=true;  e_targets=' '                           ;;
        *" -F") e_source=true;  e_targets='build binary'                ;;
+       *" -G") e_source=true;  e_targets='build-arch binary-arch'      ;;
+       *" -g") e_source=true;  e_targets='build-indep binary-indep'    ;;
        *)      e_source=true;  e_targets='build binary'                ;;
        esac
 }
@@ -91,7 +97,7 @@ bm-compute-expected () {
 }
 
 bm-run-one () {
-       local args="--clean=$cleanmode $real_act"
+       local args="$DGIT_TEST_BM_BASEARGS --clean=$cleanmode $real_act"
 
        bmid="$act,$cleanmode,$branch"
        bmid=${bmid// /_}
@@ -105,12 +111,13 @@ bm-run-one () {
        bm-compute-expected
 
        git checkout $branch
+       git clean -xdf # since we might not do any actual cleaning
 
        dsc='../example_1.0.dsc'
        rm -f $dsc
 
        set +o pipefail
-       t-dgit --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
+       t-dgit --rm-old-changes --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
        local ps="${PIPESTATUS[*]}"
        set -o pipefail
 
@@ -144,11 +151,17 @@ 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
        done
        : bm-act-iterate done.
 }
+
+bm-alwayssplit () {
+       local t=${0##*/}
+       DGIT_TEST_BM_BASEARGS+=' --always-split-source-build'
+       export DGIT_TEST_BM_BASEARGS
+       t-chain-test "${t%%-asplit}"
+}