diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 16:37:33 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 22:43:45 +0100 |
| commit | 13c1ffa10ca71511f1419372f07ef8c180b5aea4 (patch) | |
| tree | 67cf178cf51d121c317deb0b599fbbb9f871ffa3 | |
| parent | 93c90551df21fc7df60ade835e29bdbe91f65744 (diff) | |
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>
| -rw-r--r-- | debian/tests/control | 6 | ||||
| -rwxr-xr-x | tests/enumerate-tests | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-newupstream-v0 | 2 | ||||
| -rwxr-xr-x | tests/tests/gdr-viagit | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/debian/tests/control b/debian/tests/control index a72f1b8..dcc40a7 100644 --- 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 bf86d66..5a4d235 100755 --- 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 5ee8da9..e866edc 100755 --- 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 ef481b6..644d2d4 100755 --- 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 |