X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-build-modes;h=007eaf226b222c70815eae81c6bac558617a9f03;hp=2a233293ec2565accb45f171663e86625ea327b6;hb=ada4118415b67675c6ba281c818d99dfd212d1b2;hpb=9556b9d2fde1f819cf6dbd16746cd82fd6ad2026

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 2a233293..007eaf22 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -41,6 +41,8 @@ bm-prep () {
 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'		;;
@@ -54,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_${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
@@ -121,7 +141,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