From 5eb634cbbf0b0a9281c7ded077990fbd9ec81235 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:18:20 +0100 Subject: [PATCH] test suite: enumerate-tests: Refactor dependencies, support NO-DEFAULT This will allow more flexibility in a moment. No users of NO-DEFAULT yet, and no functional change. Signed-off-by: Ian Jackson --- debian/tests/control.in | 2 +- tests/enumerate-tests | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/tests/control.in b/debian/tests/control.in index 960d3ef0..b558a259 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,2 +1,2 @@ Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin +Depends: diff --git a/tests/enumerate-tests b/tests/enumerate-tests index 2c00f975..3ef0fe94 100755 --- a/tests/enumerate-tests +++ b/tests/enumerate-tests @@ -42,15 +42,26 @@ finish- () { test-begin-gencontrol () { restrictions='' - dependencies='' + dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin' } restriction-gencontrol () { restrictions+=" $r" } +gencontrol-add-deps () { + for dep in "$@"; do + dependencies+="${dependencies:+, }$dep" + done +} + dependencies-gencontrol () { - dependencies+=", $deps" + for dep in "$deps"; do + case "$dep" in + NO-DEFAULT) dependencies='' ;; + *) gencontrol-add-deps "$dep" ;; + esac + done } test-done-gencontrol () { -- 2.30.2