test suite: git-debrebase: Do some tests without dgit installed

We provide a new psuedo-dependency NO-DGIT which throws away the usual
default dependency list.

We abolish NO-DEFAULT which could not be useful because the tests
pretty much all depend on setup/gnupg which (currently, as a
workaround for the gnupg2 races) requires chiark-utils-bin for
with-lock-ex.

There are two tests which don't actually need any interaction with the
archive.  Mark them accordingly.

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

diff --git a/debian/tests/control b/debian/tests/control
index a72f1b8919d7ae971c0a35840732ed469692c547..dcc40a78c3dc462e29667d920887714af2afe372 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -16,10 +16,14 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-newupstream-v0 gdr-subcommands gdr-viagit
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-import-dgit gdr-subcommands
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, git-debrebase, git-buildpackage, faketime
 
+Tests: gdr-newupstream-v0 gdr-viagit
+Tests-Directory: tests/tests
+Depends: chiark-utils-bin, git-debrebase, git-buildpackage, faketime
+
 Tests: gitattributes
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bsdgames, man-db, git-man

diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index bf86d664b413b2d6d3bbe996010cbbed2ec9268f..5a4d23571d656db0ff9ac4612596a086adb639bb 100755 (executable)
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -58,7 +58,7 @@ gencontrol-add-deps () {
 dependencies-gencontrol () {
        for dep in "$deps"; do
                case "$dep" in
-               NO-DEFAULT) dependencies='' ;;
+               NO-DGIT) dependencies='chiark-utils-bin' ;;
                GDR) gencontrol-add-deps \
                        git-debrebase git-buildpackage faketime
                        ;;

diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0
index 5ee8da97ca024faad0d574885533063513bb5812..e866edce4a87c4f09942dc87f7999cf2707fe69c 100755 (executable)
--- a/tests/tests/gdr-newupstream-v0
+++ b/tests/tests/gdr-newupstream-v0
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies GDR
+t-dependencies NO-DGIT GDR
 
 t-setup-import gdr-convert-gbp-noarchive
 

diff --git a/tests/tests/gdr-viagit b/tests/tests/gdr-viagit
index ef481b6747d4ac4afb5f21ed3b9250642235b192..644d2d4515becd28e999fa1ab925fb07ee1949ee 100755 (executable)
--- a/tests/tests/gdr-viagit
+++ b/tests/tests/gdr-viagit
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies GDR
+t-dependencies NO-DGIT GDR
 
 t-setup-import gdr-convert-gbp-noarchive