po4a: pairwise-pocheck: Force it to be run sometimes

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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index ee2975d04c10a74cd53159aec53a0938e02548e0..bc8b2aa8113a670072573a0d5381d1f9b671ab93 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
 
@@ -33,7 +34,9 @@ bm-prep () {
                        dpkgbuildpackage_deps_for_clean=false
        fi
 
-       cleanmodes_default="git none dpkg-source dpkg-source-d"
+       cleanmodes_default="git none"
+       cleanmodes_default+=" dpkg-source$cleanmodes_dpkgsource_extra"
+       cleanmodes_default+=" dpkg-source-d$cleanmodes_dpkgsource_extra"
        cleanmodes_all="$cleanmodes_default git-ff check"
        cleanmodes="$cleanmodes_default"
 }
@@ -46,7 +49,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"
@@ -87,7 +90,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,18 +123,56 @@ 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' ;;
-       dpkg-source-d)  echo >&4 "EXAMPLE RULES TARGET clean" ;;
-       dpkg-source)    bm-build-deps-ok || tolerate_fail=tolerate
+       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"
                        ;;
-       none)           ;;
+       dpkg-source|dpkg-source,no-check)
+                       bm-build-deps-ok || tolerate_fail=tolerate
+                       echo >&4 "EXAMPLE RULES TARGET clean"
+                       ;;
+       none|Cnone)     ;;
+       Cdpkg-source*)  ;; # handled below
+       Cgit|Cgit-ff)   ;;
        *)              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
@@ -155,7 +196,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 +209,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 +240,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 +268,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
 }