chiark / gitweb /
test suite: Test --clean-git[-ff],always
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 6 Jan 2019 13:35:56 +0000 (13:35 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 6 Jan 2019 13:36:46 +0000 (13:36 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/lib-build-modes

index 8c05af6..27c5b06 100644 (file)
@@ -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_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"
 }
 
        cleanmodes="$cleanmodes_default"
 }
 
@@ -148,8 +149,10 @@ bm-compute-expected () {
        # that too and reset eff_cleanmode to $cleanmode
 
        case $eff_cleanmode in
        # 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,no-check)
                        echo >&4 "EXAMPLE RULES TARGET clean"
        check|Ccheck)   echo >&4 'BUILD-MODES PROGRAM git clean -dn -x' ;;
        dpkg-source-d|dpkg-source-d,no-check)
                        echo >&4 "EXAMPLE RULES TARGET clean"