Test suite: tartree-edit: Provide facility for comparing sets of git refs

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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 879bc016d9fe286e0b4ac60aadc85995cbd8694d..a0b47222362ca1c443e875d3fe4ade58d40a44b9 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -40,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
 }
@@ -109,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