From 13c1ffa10ca71511f1419372f07ef8c180b5aea4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 17 Jun 2018 16:37:33 +0100 Subject: 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 --- tests/enumerate-tests | 2 +- tests/tests/gdr-newupstream-v0 | 2 +- tests/tests/gdr-viagit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3