X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Fenumerate-tests;h=0f37c961027d66568eb5d63ea0c3845f20088a95;hp=912ee4ffdff4fcce80ac5ec2fc87f64b2c3386d9;hb=caa7cbcf78c1b936d5300f34c83a6b33ebebf50c;hpb=470cf3f63b4d284dbaaef8da936e716438063ac1

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 912ee4ff..0f37c961 100755
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -15,6 +15,8 @@ restriction- () {
 	set +e
 	whynot=$(t-restriction-$r)
 	rc=$?
+	whynot="${whynot//
+/ / }"
 	set -e
 	case "$rc.$whynot" in
 	0.)	;;
@@ -40,15 +42,30 @@ finish- () {
 
 test-begin-gencontrol () {
 	restrictions=''
-	dependencies=''
+	dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc'
 }
 
 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-DGIT) dependencies='chiark-utils-bin' ;;
+		NO-DEFAULT) dependencies='' ;;
+		GDR) gencontrol-add-deps \
+			git-debrebase git-buildpackage faketime
+			;;
+		*) gencontrol-add-deps "$dep" ;;
+		esac
+	done
 }
 
 test-done-gencontrol () {