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 ee2975d04c10a74cd53159aec53a0938e02548e0..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
 
@@ -87,7 +88,7 @@ bm-quirk-sbuild-after-act () {
        # provide sbuild with the dsc, not the tree, so we simply
        # ignore all executions of the clean target by schroot.
        local arch; arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
-       local sblog=../example_${v}_$arch.build
+       local sblog=$bpd/example_${v}_$arch.build
        if [ -e $sblog ]; then
                sed '
                        s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/;
@@ -120,15 +121,40 @@ bm-compute-expected () {
        exec 4>$bmexp
        echo >&4 "$heading"
 
-       case $cleanmode in
+       local eff_cleanmode=$cleanmode
+
+       case "$e_targets" in
+       *[^\ ]*)
+               ;;
+       *)
+               # 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 will only check cleanliness
+               # because it doesn't need to to make a .dsc for sbuild
+               eff_cleanmode=C$cleanmode
+               ;;
+       esac
+
+       # we are running the builder in-tree ?
+       # when we have --include-dirty, we will want to check
+       # 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' ;;
-       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
 
@@ -155,7 +181,7 @@ bm-run-one () {
        bmid="$act,$cleanmode,$branch"
        bmid=${bmid// /_}
 
-       rm -f ../${p}_{v}_*.changes
+       rm -f $bpd/${p}_{v}_*.changes
 
        heading="===== [$bmid] dgit $args ====="
 
@@ -168,7 +194,7 @@ bm-run-one () {
        git checkout $branch
        git clean -xdf # since we might not do any actual cleaning
 
-       dsc="../example_$v.dsc"
+       dsc="$bpd/example_$v.dsc"
        rm -f $dsc
 
        set +o pipefail
@@ -199,7 +225,7 @@ bm-run-one () {
        bm-report-test "SOURCE FILE" [ -e $dsc ]
 
        if [ $actual_status = success ]; then
-               local changes; changes=$(echo ../example_${v}_*.changes)
+               local changes; changes=$(echo $bpd/example_${v}_*.changes)
                case "$changes" in
                *' '*)  fail "build generated ambiguous .changes: $changes" ;;
                esac
@@ -227,9 +253,6 @@ bm-act-iterate () {
        : 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}"
+bm-buildproductsdir-nonworking () {
+       t-git-config dgit.default.build-products-dir ../bpd-dummy
 }