Test suite: When sbuild log file missing, make a note

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

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 8fa263c34448176d43c53ab424529951253e9c13..639f9b504064ec8a7743617031b0e316b8e8afa3 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -1,4 +1,17 @@
 
+bm-prep-ownpackage-branches () {
+       cat <<'END' >$tmp/stunt-git
+#!/bin/sh -e
+case "$*" in
+*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
+esac
+exec git "$@"
+END
+       chmod +x $tmp/stunt-git
+
+       bm_branches="$1"
+}
+
 bm-prep () {
        t-tstunt-parsechangelog
 
@@ -11,14 +24,7 @@ bm-prep () {
                -i debian/control
        git commit -a -m bad-build-deps
 
-       cat <<'END' >$tmp/stunt-git
-#!/bin/sh -e
-case "$*" in
-*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
-esac
-exec git "$@"
-END
-       chmod +x $tmp/stunt-git
+       bm-prep-ownpackage-branches 'indep-arch bad-build-deps'
 
        if zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' \
                /usr/share/doc/dpkg-dev/changelog.gz; then
@@ -35,6 +41,10 @@ END
 bm-guess-e-source-e-targets () {
        local some_act=$1
        case "$some_act" in
+       sbuild*" --no-arch-all"*)
+               e_source=true;  e_targets='build-arch binary-arch'      ;;
+       build-source)
+               e_source=true;  e_targets=''                            ;;
        *" -b") e_source=false; e_targets='build binary'                ;;
        *" -B") e_source=false; e_targets='build-arch binary-arch'      ;;
        *" -A") e_source=false; e_targets='build-indep binary-indep'    ;;
@@ -46,6 +56,24 @@ 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
+       else
+               echo "SBUILD LOG FILE ($sblog) MISSING"
+       fi
+}
 
 bm-report-source () {
        if "$@"; then
@@ -57,8 +85,8 @@ bm-report-source () {
 
 bm-build-deps-ok () {
        case "$branch" in
-       indep-arch)             return 0        ;;
-       bad-build-deps)         return 1        ;;
+       *bad-build-deps*)       return 1        ;;
+       *)                      return 0        ;;
        esac
 }
 
@@ -152,7 +180,7 @@ bm-run-one () {
 
 bm-act-iterate () {
        for cleanmode in $cleanmodes; do
-               for branch in indep-arch bad-build-deps; do
+               for branch in $bm_branches; do
                        bm-run-one
                done
        done