chiark / gitweb /
test suite: git-debrebase: Do some tests without dgit installed
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jun 2018 15:37:33 +0000 (16:37 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jun 2018 21:43:45 +0000 (22:43 +0100)
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>
debian/tests/control
tests/enumerate-tests
tests/tests/gdr-newupstream-v0
tests/tests/gdr-viagit

index a72f1b8..dcc40a7 100644 (file)
@@ -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
index bf86d66..5a4d235 100755 (executable)
@@ -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
                        ;;
index 5ee8da9..e866edc 100755 (executable)
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies GDR
+t-dependencies NO-DGIT GDR
 
 t-setup-import gdr-convert-gbp-noarchive
 
index ef481b6..644d2d4 100755 (executable)
@@ -2,7 +2,7 @@
 set -e
 . tests/lib
 
-t-dependencies GDR
+t-dependencies NO-DGIT GDR
 
 t-setup-import gdr-convert-gbp-noarchive