+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
-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
-
- counter=0
+ 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
else
dpkgbuildpackage_deps_for_clean=false
fi
+
+ cleanmodes_default="git none dpkg-source dpkg-source-d"
+ cleanmodes_all="$cleanmodes_default git-ff check"
+ cleanmodes="$cleanmodes_default"
+}
+
+bm-gbp-example-acts () {
+ t-gbp-example-prep
+
+ git checkout -b for-build-modes qc/quilt-tip-2
+ # build-modes cannot cope with branches containing /
+
+ bm-prep-ownpackage-branches for-build-modes
+
+ cleanmodes='git dpkg-source'
+
+ for act in "$@"; do
+ bm-guess-e-source-e-targets "$act"
+ real_act="--quilt=gbp $act"
+ case "$act" in
+ sbuild*) bm_quirk_after_act=bm-quirk-sbuild-after-act ;;
+ gbp-*) real_act="$real_act --git-ignore-branch" ;;
+ *) bm_quirk_after_act='' ;;
+ esac
+ bm-act-iterate
+ done
}
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' ;;
*" -S") e_source=true; e_targets=' ' ;;
*" -F") e_source=true; e_targets='build binary' ;;
+ *" -G") e_source=true; e_targets='build-arch binary-arch' ;;
+ *" -g") e_source=true; e_targets='build-indep binary-indep' ;;
*) e_source=true; e_targets='build binary' ;;
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_${v}_$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
bm-build-deps-ok () {
case "$branch" in
- indep-arch) return 0 ;;
- bad-build-deps) return 1 ;;
+ *bad-build-deps*) return 1 ;;
+ *) return 0 ;;
esac
}
}
bm-run-one () {
- local args="--clean=$cleanmode $real_act"
+ local args="$DGIT_TEST_BM_BASEARGS --clean=$cleanmode $real_act"
- heading="===== [$counter $branch $cleanmode $act] dgit $args ====="
+ bmid="$act,$cleanmode,$branch"
+ bmid=${bmid// /_}
- bmlog=$tmp/run-$counter-output
- bmexp=$tmp/run-$counter-expected
- bmgot=$tmp/run-$counter-results
+ heading="===== [$bmid] dgit $args ====="
+
+ bmlog=$tmp/run.$bmid.output
+ bmexp=$tmp/run.$bmid.expected
+ bmgot=$tmp/run.$bmid.results
bm-compute-expected
git checkout $branch
+ git clean -xdf # since we might not do any actual cleaning
- dsc='../example_1.0.dsc'
+ dsc="../example_$v.dsc"
rm -f $dsc
set +o pipefail
- t-dgit --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
+ t-dgit --rm-old-changes --git=$tmp/stunt-git $args 2>&1 | tee $bmlog
local ps="${PIPESTATUS[*]}"
set -o pipefail
$bm_quirk_before_diff
[ $actual_status = failure ] || diff -U10 $bmexp $bmgot
-
- counter=$(( $counter + 1 ))
}
bm-act-iterate () {
- for cleanmode in git none dpkg-source dpkg-source-d; do
- # git-ff check removed because they're really very similar
- for branch in indep-arch bad-build-deps; do
+ for cleanmode in $cleanmodes; do
+ for branch in $bm_branches; do
bm-run-one
done
done
: bm-act-iterate done.
}
+
+bm-alwayssplit () {
+ local t=${0##*/}
+ DGIT_TEST_BM_BASEARGS+=' --always-split-source-build'
+ export DGIT_TEST_BM_BASEARGS
+ t-chain-test "${t%%-asplit}"
+}