diff options
author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-04-14 15:46:25 -0700 |
---|---|---|
committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-04-14 15:46:25 -0700 |
commit | 0da7834584f18dd70a6b5e979b33629f9051b003 (patch) | |
tree | cacad5f24d61ce7e0a69c0d57829066737b5f5c5 /tox.ini | |
parent | b4437ebd9a1b3b8fe61e164e8b4894ba6fdf17d8 (diff) | |
download | ansible-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.ini | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |