git-debrebase: Rename a variable $ups_tag to $ups_rev

[dgit.git] / tests / enumerate-tests

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 506f80dc31afda10ed93abc3517ecb4f08b5beff..9b9271cb1baf1cf756caed9313ba694e3a1d29a3 100755 (executable)
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -42,7 +42,7 @@ finish- () {
 
 test-begin-gencontrol () {
        restrictions=''
-       dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime'
+       dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, liburi-perl'
 }
 
 gencontrol-add-things () {
@@ -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)
@@ -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