test suite: Test --clean-git[-ff],always

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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 232d322e139fe983b3a730be15b7f80e717dd2f1..27c5b06ca6abc5f1f9fde4488ee309b9f40f5953 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,6 +38,7 @@ bm-prep () {
        cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra"
        cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra"
        cleanmodes_all="$cleanmodes_default git-ff check"
+       cleanmodes_all+=" git,always git,always"
        cleanmodes="$cleanmodes_default"
 }
 
@@ -49,7 +50,7 @@ bm-gbp-example-acts () {
 
        bm-prep-ownpackage-branches for-build-modes
 
-       cleanmodes='git dpkg-source'
+       cleanmodes='git dpkg-source,no-check'
 
        for act in "$@"; do
                bm-guess-e-source-e-targets "$act"
@@ -148,21 +149,33 @@ bm-compute-expected () {
        # that too and reset eff_cleanmode to $cleanmode
 
        case $eff_cleanmode in
-       git)            echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
-       git-ff)         echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
+       git|Cgit,always)
+                       echo >&4 'BUILD-MODES PROGRAM git clean -xdf' ;;
+       git-ff|Cgit-ff,always)
+                       echo >&4 'BUILD-MODES PROGRAM git clean -xdff' ;;
        check|Ccheck)   echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
-       dpkg-source-d)
+       dpkg-source-d|dpkg-source-d,no-check)
                        echo >&4 "EXAMPLE RULES TARGET clean"
                        ;;
-       dpkg-source)
+       dpkg-source|dpkg-source,no-check)
                        bm-build-deps-ok || tolerate_fail=tolerate
                        echo >&4 "EXAMPLE RULES TARGET clean"
                        ;;
-       none)           ;;
-       C*)             echo "TODO bm eff_cleanmode=$eff_cleanmode" ;;
+       none|Cnone)     ;;
+       Cdpkg-source*)  ;; # handled below
+       Cgit|Cgit-ff)   echo >&4 'BUILD-MODES PROGRAM git clean -dn' ;;
        *)              fail "t-compute-expected-run $cleanmode ??" ;;
        esac
 
+       case $eff_cleanmode in
+       dpkg-source|Cdpkg-source|dpkg-source-d|Cdpkg-source-d)
+                       echo >&4 'BUILD-MODES PROGRAM git clean -dn'
+                       ;;
+       dpkg-source*,no-check|Cdpkg-source*,no-check)
+                       ;;
+       Cdpkg-source*)  fail "t-compute-expected-run wd $cleanmode ??" ;;
+       esac
+
        if [ "x$e_targets" != x ]; then
                # e_targets can be " " to mean `/may/ fail due to b-d'
                bm-build-deps-ok || tolerate_fail=tolerate