test suite: git-debrebase: provide GDR "macro" for dependencies

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 3ef0fe9429588b5577b15731310eb5533627080b..52cc289e2e2885c86d3aa24ff79dfebbcef34c1a 100755 (executable)
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -59,6 +59,9 @@ dependencies-gencontrol () {
        for dep in "$deps"; do
                case "$dep" in
                NO-DEFAULT) dependencies='' ;;
+               GDR) gencontrol-add-deps \
+                       git-buildpackage libfile-fnmatch-perl faketime
+                       ;;
                *) gencontrol-add-deps "$dep" ;;
                esac
        done

diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 1405aa4f905909ebf13caa53a6ac29f884e44c85..427f2301205e79a13f8b88c35de5d36a8b8790a4 100755 (executable)
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -3,7 +3,7 @@ set -e
 . tests/lib
 . $troot/lib-gdr
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-tstunt-parsechangelog
 

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 9951f5d7a56a574c47656e354fbc7fccaf014875..15bf9013ad553733bff805f95718c869cb3bccc9 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-diverge-nmu-dgit b/tests/tests/gdr-diverge-nmu-dgit
index bb6a19f40715f678e408bdfc95e00429a9887075..4b5907a1caafc13b49a0e676ce0037da651e5bb2 100755 (executable)
--- a/tests/tests/gdr-diverge-nmu-dgit
+++ b/tests/tests/gdr-diverge-nmu-dgit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index a23c2f0897154c9729da049d0f2b4447b9f70caa..6c77184a11058541a33b1661ef6c4cf65f036fb9 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 716a5ec7cc0a686f2fc7be2680cdf152c91e15cb..19918d8bc5e546fea77e7a9803231da20c2ae731 100755 (executable)
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 485c8084893ca9c0a8050c0f61d06652e81324c6..10404a55657b8e8123e38e4fab94b28145e09cfa 100755 (executable)
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-subcommands b/tests/tests/gdr-subcommands
index 0d5a30bd3c7ce05a43f7ec6d3be3c2333a01037e..e59fc07aaeab6ada1e0a510e3be9ff8b3027d299 100755 (executable)
--- a/tests/tests/gdr-subcommands
+++ b/tests/tests/gdr-subcommands
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp
 

diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
index 5f6e1d877239dde15d6c7a7901051c6bd96d718e..454b02d69ed842a2e42d05f323cba2824d147f04 100755 (executable)
--- a/tests/tests/gdr-viagit
+++ b/tests/tests/gdr-viagit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
 t-setup-import gdr-convert-gbp