diff --git a/tox.ini b/tox.ini index 1fd7cb939..d5d70b570 100644 --- a/tox.ini +++ b/tox.ini @@ -1,22 +1,24 @@ -[test] +[testenv] changedir=testing argv=py.test --confcutdir=.. --junitxml=junit-{envname}.xml [testenv:py26] -python=python2.6 +basepython=python2.6 [testenv:py25] -python=python2.5 +basepython=python2.5 [testenv:py24] -python=python2.4 +basepython=python2.4 [testenv:py31] -python=python3.1 +basepython=python3.1 #[testenv:pypy] #python=pypy-c [testenv:jython] changedir=testing -python=jython -argv=jython - {envbindir}/py.test-jython - --confcutdir=.. - --junitxml=junit-{envname}.xml +basepython=jython +deps=pytest-xdist +argv= + {envpython} + {envbindir}/py.test-jython + acceptance_test.py + plugin