X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-build-modes;h=3bb1bf3f8d5f7e3fd4682c07704ec38d922bff86;hb=b62c158368158b278bcb31447f8b1442cb531898;hp=6465b6160341a55e6cf12179dfc71f0f6d97ed00;hpb=dbee6afd429a8cf4136a040d95ea10fe3a38520e;p=dgit.git diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 6465b616..3bb1bf3f 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 &/; @@ -179,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 =====" @@ -192,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 @@ -223,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