X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tox.ini;h=313f1eca27f3e8c537194b7d99334158d3acfbc9;hb=7411096e94f7e30f03c73cc0b8d66dbd076fc37e;hp=ed2fd4a7d0883e2198e62de71a1988c848d3d554;hpb=29476ed0317dcc635dff67d2fc9fd68233aa6656;p=yardstick.git

diff --git a/tox.ini b/tox.ini
index ed2fd4a7d..313f1eca2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,9 @@ envlist = py{27,3},pep8,functional{,-py3},coverage
 
 [testenv]
 usedevelop=True
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY BRANCH
+setenv =
+   VIRTUAL_ENV={envdir}
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
@@ -13,7 +15,7 @@ whitelist_externals = /bin/bash
 
 [testenv:py27]
 commands =
-  /bin/bash ./run_tests.sh --unit
+  /bin/bash {toxinidir}/tools/run_tests.sh --unit
 
 [testenv:py3]
 basepython = python3
@@ -32,11 +34,11 @@ commands =
 [testenv:coverage]
 basepython = python3
 commands =
-  /bin/bash ./run_tests.sh --coverage
+  /bin/bash {toxinidir}/tools/run_tests.sh --coverage
 
 [testenv:functional]
 commands =
-  /bin/bash ./run_tests.sh --functional
+  /bin/bash {toxinidir}/tools/run_tests.sh --functional
 
 [testenv:functional-py3]
 basepython = python3