Test suite: Move bm-quirk-sbuild-after-act to lib-build-modes

This will allow other tests to check dgit sbuild.

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 93997c67bec6e61c0be8ca1b6f102cd0aaed8aa3..05c415cac725e87fdc993598fe39a8db7fc1a56a 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -56,6 +56,22 @@ bm-guess-e-source-e-targets () {
        esac
 }
 
+bm-quirk-sbuild-after-act () {
+       # 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 arch=$(dpkg-architecture -qDEB_BUILD_ARCH)
+       local sblog=../example_1.0_$arch.build
+       if [ -e $sblog ]; then
+               sed '
+                       s/^EXAMPLE RULES TARGET clean/HOOK SUPPRESSED &/;
+               ' <$sblog >>$bmlog
+       fi
+}
 
 bm-report-source () {
        if "$@"; then

diff --git a/tests/tests/build-modes-sbuild b/tests/tests/build-modes-sbuild
index e9e92f4a72c3ad6907a0f32737c68aa3b8cdb14a..f030f71a27063665ca3d17d28f8145310c0a144d 100755 (executable)
--- 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"