X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fbuild-modes-sbuild;h=be2d4c979fef3c3a08451665a676e8c725268af5;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=e9e92f4a72c3ad6907a0f32737c68aa3b8cdb14a;hpb=ac57e4c973a8a5a93e6fbb258908b429babd5bae;p=dgit.git

diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild
index e9e92f4a..be2d4c97 100755
--- a/tests/tests/build-modes-sbuild
+++ b/tests/tests/build-modes-sbuild
@@ -6,30 +6,15 @@ 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
+t-buildproductsdir-config
 
+bm_quirk_after_act=bm-quirk-sbuild-after-act
 bm-prep
 
-act="sbuild -c build --no-arch-all"
+act="sbuild -c $schroot --no-arch-all"
 real_act="$act"
 
 bm-guess-e-source-e-targets "$act"
 bm-act-iterate
 
-echo ok.
+t-ok