diff options
Diffstat (limited to 'tests/lib-build-modes')
| -rw-r--r-- | tests/lib-build-modes | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/tests/lib-build-modes b/tests/lib-build-modes index ee2975d..3bb1bf3 100644 --- a/tests/lib-build-modes +++ b/tests/lib-build-modes @@ -87,7 +87,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,7 +120,31 @@ bm-compute-expected () { exec 4>$bmexp echo >&4 "$heading" - case $cleanmode in + local eff_cleanmode=$cleanmode + + case "$e_targets" in + *[^\ ]*) + ;; + *) + # dgit won't bother cleaning the tree + # if no build is going to be run + eff_cleanmode=none + ;; + esac + + case "$act" in + sbuild*) + # dgit sbuild won't bother cleaning the tree + # because it doesn't need to to make a .dsc for sbuild + eff_cleanmode=none + ;; + 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' ;; @@ -155,7 +179,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 +192,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 +223,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 @@ -226,10 +250,3 @@ bm-act-iterate () { done : 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}" -} |