Test suite: Honour t-dependencies, so rsync only installed for mirror tests

diff --git a/debian/tests/control b/debian/tests/control
index 9bd27a301559d4acb2b1cc08979c9cf16a910767..622c5dfbe3f8b98eef670642557f0a96977f3713 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,13 @@
 Tests: dsd-clone-drs
 Tests-Directory: tests/tests
 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
 
 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-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 62ff3ee380909ae6c137fa2e7ca2740d27b859cb..1ca22b5b4b58ecf207e73ee50d364e511d754fe6 100644 (file)
--- a/debian/tests/control.in
+++ b/debian/tests/control.in
@@ -1,2 +1,2 @@
 Tests-Directory: tests/tests
 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 0889b1814fec7524be91943627150af3430c3f1b..95c1cdbd139f6cb39d4260ad5a7a15079cb06e2e 100755 (executable)
--- a/tests/tests/mirror
+++ b/tests/tests/mirror
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 . $troot/lib-mirror
 
 . tests/lib
 . $troot/lib-mirror
 

+t-dependencies rsync
+

 t-drs
 
 : ---- "basic test" ----
 t-drs
 
 : ---- "basic test" ----

diff --git a/tests/tests/mirror-debnewgit b/tests/tests/mirror-debnewgit
index ff1da4a0c9c520f5dc49bd1574aa2a83429b30e6..4f2471604d04ce70b240dd1fedfe8413fbc39bcf 100755 (executable)
--- a/tests/tests/mirror-debnewgit
+++ b/tests/tests/mirror-debnewgit
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 . $troot/lib-mirror
 
 . tests/lib
 . $troot/lib-mirror
 

+t-dependencies rsync
+

 t-debpolicy
 
 t-archive pari-extra 3-1
 t-debpolicy
 
 t-archive pari-extra 3-1

diff --git a/tests/tests/mirror-private b/tests/tests/mirror-private
index 51053390233aeaa3e9b5ca888cccfe4dcb27d203..40338356f16c9a7d5dab0abc9d434407c3ceaa6c 100755 (executable)
--- a/tests/tests/mirror-private
+++ b/tests/tests/mirror-private
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 . $troot/lib-mirror
 
 . tests/lib
 . $troot/lib-mirror
 

+t-dependencies rsync
+

 t-debpolicy
 
 t-tstunt-parsechangelog
 t-debpolicy
 
 t-tstunt-parsechangelog