test suite: checkout: Check we end up on the right branch each time

[dgit.git] / tests / tests / build-modes-sbuild

diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild
index a4ffcf5b6a3e8f175f63ed186b2ea620beef2ebb..19dcc8a41de08d47749d77014b52d5bf5421cdab 100755 (executable)
--- a/tests/tests/build-modes-sbuild
+++ b/tests/tests/build-modes-sbuild
@@ -6,31 +6,13 @@ 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"
-real_act="$act --no-arch-all"
+act="sbuild -c build --no-arch-all"
+real_act="$act"
 
-e_source=true
-e_targets='build-arch binary-arch'
+bm-guess-e-source-e-targets "$act"
 bm-act-iterate
 
-echo ok.
+t-ok