summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-04-14 15:46:25 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2015-04-14 15:46:25 -0700
commit0da7834584f18dd70a6b5e979b33629f9051b003 (patch)
treecacad5f24d61ce7e0a69c0d57829066737b5f5c5 /tox.ini
parentb4437ebd9a1b3b8fe61e164e8b4894ba6fdf17d8 (diff)
downloadansible-0da7834584f18dd70a6b5e979b33629f9051b003.tar.gz
Move command for v1 back into testenv so that we have a default
(We have a jenkins build that creates a [testenv:jenkins] so it needs there to be a default value
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 4 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 5691980b60..5440a5825c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,20 +2,22 @@
envlist = {py26,py27}-v{1}
[testenv]
+commands = make tests
deps = -r{toxinidir}/test-requirements.txt
whitelist_externals = make
[testenv:py26-v1]
-commands = make tests
[testenv:py27-v1]
-commands = make tests
[testenv:py26-v2]
+deps = -r{toxinidir}/v2/test-requirements.txt
commands = make newtests
[testenv:py27-v2]
+deps = -r{toxinidir}/v2/test-requirements.txt
commands = make newtests
[testenv:py34-v2]
+deps = -r{toxinidir}/v2/test-requirements.txt
commands = make newtests