X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fbuild-modes-sbuild;h=f030f71a27063665ca3d17d28f8145310c0a144d;hb=5dfc6a96cc69cd63ba7ff3be90d909391cf717b3;hp=e9e92f4a72c3ad6907a0f32737c68aa3b8cdb14a;hpb=ac57e4c973a8a5a93e6fbb258908b429babd5bae;p=dgit.git diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild index e9e92f4a..f030f71a 100755 --- a/tests/tests/build-modes-sbuild +++ b/tests/tests/build-modes-sbuild @@ -6,24 +6,7 @@ set -e t-dependencies sbuild t-restrict x-dgit-schroot-build -arch=$(dpkg-architecture -qDEB_BUILD_ARCH) -after-hook () { - # sbuild likes to run the package clean target in the chroot, - # which isn't necessary in our case. We don't disable it in - # dgit because we want to do what sbuild does, in case there - # are packages which don't build unless their clean target was - # run. We know it must be running it in the chroot because we - # provide sbuild with the dsc, not the tree, so we simply - # ignore all executions of the clean target by schroot. - local sblog=../example_1.0_$arch.build - if [ -e $sblog ]; then - sed ' - s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/; - ' <$sblog >>$bmlog - fi -} -bm_quirk_after_act=after-hook - +bm_quirk_after_act=bm-quirk-sbuild-after-act bm-prep act="sbuild -c build --no-arch-all"