X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=4b0f944f7c2f595b64dbdb2104c46600e8e678fe;hp=c3d636781ae0b33e7135e9a52a7f328c3a1d2ec2;hb=d206873437a8ee676eeb2806754a57fa938c9a4c;hpb=0f74d9d90bbb3284dbbb3cca306607667aa9e94c

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index c3d63678..4b0f944f 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,9 +38,35 @@ bm-prep () {
 	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'	;;
@@ -52,6 +78,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_${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
@@ -119,7 +163,7 @@ bm-run-one () {
 	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