dgit: Reorganise url_fetch

[dgit.git] / tests / enumerate-tests

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 31a234d5d423a4788d17a75b831926f29f5924a1..8ee34bec4a354ec9824d098108ccb871c8061e16 100755 (executable)
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -52,6 +52,9 @@ restriction-gencontrol () {
 
 gencontrol-add-deps () {
        for dep in "$@"; do
+               case " $dependencies," in
+               *" "$dep","*)   continue ;;
+               esac
                dependencies+="${dependencies:+, }$dep"
        done
 }
@@ -111,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