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=05c415cac725e87fdc993598fe39a8db7fc1a56a;hb=d206873437a8ee676eeb2806754a57fa938c9a4c;hpb=bed276c8b1bba18717cbe8199c07812eba5c2a95

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 05c415ca..4b0f944f 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -38,6 +38,28 @@ 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
@@ -65,11 +87,13 @@ bm-quirk-sbuild-after-act () {
 	# 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
+	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
 }
 
@@ -139,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