summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-25 19:04:03 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-25 19:04:03 +0100
commit0717f9a00045e66531a1607e60fa470119624060 (patch)
tree6ca336462c6b77028998eb6497f423fc745f01f0
parent998585898243fcead22928f903331412091936cb (diff)
Test suite: Honour t-dependencies, so rsync only installed for mirror tests
-rw-r--r--debian/tests/control8
-rw-r--r--debian/tests/control.in2
-rwxr-xr-xtests/tests/mirror2
-rwxr-xr-xtests/tests/mirror-debnewgit2
-rwxr-xr-xtests/tests/mirror-private2
5 files changed, 13 insertions, 3 deletions
diff --git a/debian/tests/control b/debian/tests/control
index 9bd27a3..622c5df 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 62ff3ee..1ca22b5 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 0889b18..95c1cdb 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 ff1da4a..4f24716 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 5105339..4033835 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