X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Fenumerate-tests;h=a532b526bfa56efcccaf6000016914a1eb4749e9;hp=bf86d664b413b2d6d3bbe996010cbbed2ec9268f;hb=3863dba15266045f598312bb14306f4b43a3ca13;hpb=93c90551df21fc7df60ade835e29bdbe91f65744 diff --git a/tests/enumerate-tests b/tests/enumerate-tests index bf86d664..a532b526 100755 --- a/tests/enumerate-tests +++ b/tests/enumerate-tests @@ -42,10 +42,11 @@ finish- () { test-begin-gencontrol () { restrictions='' - dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin' + dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime' } restriction-gencontrol () { + if [ $r = x-dgit-out-of-tree-only ]; then return; fi restrictions+=" $r" } @@ -58,9 +59,10 @@ gencontrol-add-deps () { dependencies-gencontrol () { for dep in "$deps"; do case "$dep" in + NO-DGIT) dependencies='chiark-utils-bin, faketime' ;; NO-DEFAULT) dependencies='' ;; GDR) gencontrol-add-deps \ - git-debrebase git-buildpackage faketime + git-debrebase git-buildpackage ;; *) gencontrol-add-deps "$dep" ;; esac