chiark / gitweb /
test suite: Use $bpd in several places where it is needed
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 26 Jul 2018 06:28:59 +0000 (07:28 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 26 Jul 2018 12:00:47 +0000 (13:00 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/lib-build-modes

index 6465b61..3bb1bf3 100644 (file)
@@ -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