diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-26 07:28:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-26 13:00:47 +0100 |
| commit | 6570d5434f811cf0ed7257d557d91ba1a7dbee93 (patch) | |
| tree | 7fa040f83b6d1d5273db8c7cba06a92404fd541f /tests/lib-build-modes | |
| parent | 6e35e65c7cfb860c64ca036bd5b2236b97dd5a3d (diff) | |
test suite: Use $bpd in several places where it is needed
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/lib-build-modes')
| -rw-r--r-- | tests/lib-build-modes | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 6465b61..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 &/; @@ -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 |