From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 27 Jul 2015 11:32:20 +0000 (+0100)
Subject: Test suite: build-modes tests: Generate id rather than using counter
X-Git-Tag: debian/1.1~11
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ef183550b7acfe69e8f615f5234e3014a36fbedc

Test suite: build-modes tests: Generate id rather than using counter
---

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 836d1ece..5daf3bf5 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -20,8 +20,6 @@ exec git "$@"
 END
 	chmod +x $tmp/stunt-git
 
-	counter=0
-
 	if zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' \
 		/usr/share/doc/dpkg-dev/changelog.gz; then
 			dpkgbuildpackage_deps_for_clean=true
@@ -95,11 +93,14 @@ bm-compute-expected () {
 bm-run-one () {
 	local args="--clean=$cleanmode $real_act"
 
-	heading="===== [$counter $branch $cleanmode $act] dgit $args ====="
+	bmid="$act,$cleanmode,$branch"
+	bmid=${bmid// /_}
+
+	heading="===== [$bmid] dgit $args ====="
 
-	bmlog=$tmp/run-$counter-output
-	bmexp=$tmp/run-$counter-expected
-	bmgot=$tmp/run-$counter-results
+	bmlog=$tmp/run.$bmid.output
+	bmexp=$tmp/run.$bmid.expected
+	bmgot=$tmp/run.$bmid.results
 
 	bm-compute-expected
 
@@ -140,8 +141,6 @@ bm-run-one () {
 	$bm_quirk_before_diff
 
 	[ $actual_status = failure ] || diff -U10 $bmexp $bmgot
-
-	counter=$(( $counter + 1 ))
 }
 
 bm-act-iterate () {