dgit: clean_tree_check: Reorganise command construction

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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 115ee71e2809def42885255cab10267fdb21ecb2..403d8b26d98e8ff8355221dafa52adf6f3a4c284 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -14,6 +14,7 @@ END
 
 bm-prep () {
        t-tstunt-parsechangelog
+       t-tstunt dpkg-deb
 
        t-prep-newpackage example 1.0
 
@@ -126,17 +127,17 @@ bm-compute-expected () {
        *[^\ ]*)
                ;;
        *)
-               # dgit won't bother cleaning the tree
-               # if no build is going to be run
-               eff_cleanmode=none
+               # if no build is going to be run, dgit will only check
+               # cleanliness rather than actually cleaning
+               eff_cleanmode=C$cleanmode
                ;;
        esac
 
        case "$act" in
        sbuild*)
-               # dgit sbuild won't bother cleaning the tree
+               # dgit sbuild will only check cleanliness
                # because it doesn't need to to make a .dsc for sbuild
-               eff_cleanmode=none
+               eff_cleanmode=C$cleanmode
                ;;
        esac
 
@@ -147,12 +148,13 @@ bm-compute-expected () {
        case $eff_cleanmode in
        git)            echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
        git-ff)         echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
-       check)          echo >&4 'BUILD-MODES PROGRAM git clean -xdn' ;;
+       check|Ccheck)   echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
        dpkg-source-d)  echo >&4 "EXAMPLE RULES TARGET clean" ;;
        dpkg-source)    bm-build-deps-ok || tolerate_fail=tolerate
                        echo >&4 "EXAMPLE RULES TARGET clean"
                        ;;
        none)           ;;
+       C*)             echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
        *)              fail "t-compute-expected-run $cleanmode ??" ;;
        esac