From 0717f9a00045e66531a1607e60fa470119624060 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Jul 2015 19:04:03 +0100 Subject: [PATCH] Test suite: Honour t-dependencies, so rsync only installed for mirror tests --- debian/tests/control | 8 ++++++-- debian/tests/control.in | 2 +- tests/tests/mirror | 2 ++ tests/tests/mirror-debnewgit | 2 ++ tests/tests/mirror-private | 2 ++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/tests/control b/debian/tests/control index 9bd27a30..622c5dfb 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,9 +1,13 @@ Tests: dsd-clone-drs Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, rsync +Depends: dgit, dgit-infrastructure, devscripts Restrictions: x-dgit-intree-only x-dgit-git-only -Tests: clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast mirror mirror-debnewgit mirror-private push-buildproductsdir push-newpackage push-nextdgit quilt rpush tag-updates test-list-uptodate trustingpolicy-replay +Tests: mirror mirror-debnewgit mirror-private Tests-Directory: tests/tests Depends: dgit, dgit-infrastructure, devscripts, rsync +Tests: clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast push-buildproductsdir push-newpackage push-nextdgit quilt rpush tag-updates test-list-uptodate trustingpolicy-replay +Tests-Directory: tests/tests +Depends: dgit, dgit-infrastructure, devscripts + diff --git a/debian/tests/control.in b/debian/tests/control.in index 62ff3ee3..1ca22b5b 100644 --- a/debian/tests/control.in +++ b/debian/tests/control.in @@ -1,2 +1,2 @@ Tests-Directory: tests/tests -Depends: dgit, dgit-infrastructure, devscripts, rsync +Depends: dgit, dgit-infrastructure, devscripts diff --git a/tests/tests/mirror b/tests/tests/mirror index 0889b181..95c1cdbd 100755 --- a/tests/tests/mirror +++ b/tests/tests/mirror @@ -3,6 +3,8 @@ set -e . tests/lib . $troot/lib-mirror +t-dependencies rsync + t-drs : ---- "basic test" ---- diff --git a/tests/tests/mirror-debnewgit b/tests/tests/mirror-debnewgit index ff1da4a0..4f247160 100755 --- a/tests/tests/mirror-debnewgit +++ b/tests/tests/mirror-debnewgit @@ -3,6 +3,8 @@ set -e . tests/lib . $troot/lib-mirror +t-dependencies rsync + t-debpolicy t-archive pari-extra 3-1 diff --git a/tests/tests/mirror-private b/tests/tests/mirror-private index 51053390..40338356 100755 --- a/tests/tests/mirror-private +++ b/tests/tests/mirror-private @@ -3,6 +3,8 @@ set -e . tests/lib . $troot/lib-mirror +t-dependencies rsync + t-debpolicy t-tstunt-parsechangelog -- 2.30.2