From 3c4154c9a98c7c1ecb9ca224590e80b81465d305 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 23:45:22 +0100 Subject: 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(-) (limited to 'tests/enumerate-tests') diff --git a/tests/enumerate-tests b/tests/enumerate-tests index 8ee34be..c80a35c 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 () { -- cgit v1.2.3 From aac7e87787e258c95774c628aa411eb7bb64a3c3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 23:53:47 +0100 Subject: test suite: enumerate-tests: gencontrol-add-things: delim feature No functional change. Signed-off-by: Ian Jackson --- tests/enumerate-tests | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/enumerate-tests') diff --git a/tests/enumerate-tests b/tests/enumerate-tests index c80a35c..506f80d 100755 --- a/tests/enumerate-tests +++ b/tests/enumerate-tests @@ -47,13 +47,14 @@ test-begin-gencontrol () { gencontrol-add-things () { local varname=$1; shift + local delim=$1; shift local thing eval ' for thing in "$@"; do - case " $'$varname'," in - *" "$thing","*) continue ;; + case " $'$varname$delim '" in + *" "$thing"'$delim' "*) continue ;; esac - '$varname'+="${'$varname':+, }$thing" + '$varname'+="${'$varname':+'$delim' }$thing" done ' } @@ -64,7 +65,7 @@ restriction-gencontrol () { } gencontrol-add-deps () { - gencontrol-add-things dependencies "$@" + gencontrol-add-things dependencies , "$@" } dependencies-gencontrol () { -- cgit v1.2.3 From 70509cc2230ab22a539cc26ca8e81e7e48929a34 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 23:54:09 +0100 Subject: test suite: enumerate-tests: gencontrol-add-things: restrictions No functional change. Signed-off-by: Ian Jackson --- tests/enumerate-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/enumerate-tests') diff --git a/tests/enumerate-tests b/tests/enumerate-tests index 506f80d..f46c598 100755 --- a/tests/enumerate-tests +++ b/tests/enumerate-tests @@ -61,7 +61,7 @@ gencontrol-add-things () { restriction-gencontrol () { if [ $r = x-dgit-out-of-tree-only ]; then return; fi - restrictions+=" $r" + gencontrol-add-things restrictions '' "$r" } gencontrol-add-deps () { @@ -98,7 +98,7 @@ test-done-gencontrol () { } ' case "$restrictions" in - ?*) echo "Restrictions:$restrictions" ;; + ?*) echo "Restrictions: $restrictions" ;; esac ) key=$(printf "%s" "$stanza" | sha256sum) -- cgit v1.2.3 From 0a9cdb0e81365422d2c5f9cefb83b316acaee9b4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Aug 2019 23:54:44 +0100 Subject: test suite: enumerate-tests: Spot t-alt-test And find the dependencies of the referred-to test. No functional change since currently no chained-to test has any nonstandard dependencies. Signed-off-by: Ian Jackson --- tests/enumerate-tests | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/enumerate-tests') diff --git a/tests/enumerate-tests b/tests/enumerate-tests index f46c598..680236e 100755 --- a/tests/enumerate-tests +++ b/tests/enumerate-tests @@ -141,6 +141,10 @@ allsedderies () { for import in $(seddery 's/^t-setup-import //p'); do allsedderies tests/setup/$import done + if egrep -q '^t-alt-test *$' <$tf; then + local leaf=${tf#tests/tests/} + allsedderies tests/tests/"${leaf#*-}" + fi } for t in $(run-parts --list tests/tests); do -- cgit v1.2.3