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 <ijackson@chiark.greenend.org.uk>

2 files changed, 14 insertions, 3 deletions

diff --git a/debian/tests/control.in b/debian/tests/control.in
index 960d3ef..b558a25 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 2c00f97..3ef0fe9 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 () {