X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fenumerate-tests;h=8ee34bec4a354ec9824d098108ccb871c8061e16;hb=4bbb0ea95dcf9be8e26f19424ad3b5269a556783;hp=5a4d23571d656db0ff9ac4612596a086adb639bb;hpb=13c1ffa10ca71511f1419372f07ef8c180b5aea4;p=dgit.git

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 5a4d2357..8ee34bec 100755
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -42,15 +42,19 @@ finish- () {
 
 test-begin-gencontrol () {
 	restrictions=''
-	dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin'
+	dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime'
 }
 
 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
 }
@@ -58,9 +62,17 @@ gencontrol-add-deps () {
 dependencies-gencontrol () {
 	for dep in "$deps"; do
 		case "$dep" in
-		NO-DGIT) dependencies='chiark-utils-bin' ;;
+		NO-DGIT) dependencies='chiark-utils-bin, faketime' ;;
+		NO-DEFAULT) dependencies='' ;;
 		GDR) gencontrol-add-deps \
-			git-debrebase git-buildpackage faketime
+			git-debrebase git-buildpackage
+			;;
+		DEBORIG) gencontrol-add-deps \
+			devscripts libdpkg-perl \
+			libgit-wrapper-perl liblist-compare-perl \
+			libstring-shellquote-perl libtry-tiny-perl \
+			# NB git-deborig is not compatible with
+			#  t-tstunt-parsechangelog
 			;;
 		*) gencontrol-add-deps "$dep" ;;
 		esac
@@ -102,21 +114,29 @@ finish-gencontrol () {
 
 seddery () {
 	local seddery=$1
-	sed <$t -n '
+	sed <$tf -n '
 		20q;
 		/^: t-enumerate-tests-end$/q;
 		'"$seddery"'
 	'
 }
 
-for t in $(run-parts --list tests/tests); do
-	test-begin-$mode
+allsedderies () {
+	local tf=$1
 	for r in $(seddery 's/^t-restrict //p'); do
 		restriction-$mode
 	done
 	for deps in $(seddery 's/^t-dependencies //p'); do
 		dependencies-$mode
 	done
+	for import in $(seddery 's/^t-setup-import //p'); do
+		allsedderies tests/setup/$import
+	done
+}
+
+for t in $(run-parts --list tests/tests); do
+	test-begin-$mode
+	allsedderies $t
 	test-done-$mode
 done