From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Aug 2019 22:45:22 +0000 (+0100)
Subject: test suite: enumerate-tests: Break out gencontrol-add-things
X-Git-Tag: archive/debian/9.7~29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3c4154c9a98c7c1ecb9ca224590e80b81465d305;p=dgit.git

test suite: enumerate-tests: Break out gencontrol-add-things

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 8ee34bec..c80a35c9 100755
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -45,18 +45,26 @@ test-begin-gencontrol () {
 	dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime'
 }
 
+gencontrol-add-things () {
+	local varname=$1; shift
+	local thing
+	eval '
+		for thing in "$@"; do
+			case " $'$varname'," in
+			*" "$thing","*)	continue ;;
+			esac
+			'$varname'+="${'$varname':+, }$thing"
+		done
+	'
+}
+
 restriction-gencontrol () {
 	if [ $r = x-dgit-out-of-tree-only ]; then return; fi
 	restrictions+=" $r"
 }
 
 gencontrol-add-deps () {
-	for dep in "$@"; do
-		case " $dependencies," in
-		*" "$dep","*)	continue ;;
-		esac
-		dependencies+="${dependencies:+, }$dep"
-	done
+	gencontrol-add-things dependencies "$@"
 }
 
 dependencies-gencontrol () {