From 3c4154c9a98c7c1ecb9ca224590e80b81465d305 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 23:45:22 +0100 Subject: [PATCH] test suite: enumerate-tests: Break out gencontrol-add-things No functional change. Signed-off-by: Ian Jackson --- tests/enumerate-tests | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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 () { -- 2.30.2