summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib-build-modes16
-rwxr-xr-xtests/tests/build-modes-sbuild19
2 files changed, 17 insertions, 18 deletions
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 93997c6..05c415c 100644
--- 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 e9e92f4..f030f71 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"