Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Refactor remote command execution in pktgen_dpdk"
[yardstick.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index
ed2fd4a
..
313f1ec
100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-5,7
+5,9
@@
envlist = py{27,3},pep8,functional{,-py3},coverage
[testenv]
usedevelop=True
[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
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@@
-13,7
+15,7
@@
whitelist_externals = /bin/bash
[testenv:py27]
commands =
[testenv:py27]
commands =
- /bin/bash
.
/run_tests.sh --unit
+ /bin/bash
{toxinidir}/tools
/run_tests.sh --unit
[testenv:py3]
basepython = python3
[testenv:py3]
basepython = python3
@@
-32,11
+34,11
@@
commands =
[testenv:coverage]
basepython = python3
commands =
[testenv:coverage]
basepython = python3
commands =
- /bin/bash
.
/run_tests.sh --coverage
+ /bin/bash
{toxinidir}/tools
/run_tests.sh --coverage
[testenv:functional]
commands =
[testenv:functional]
commands =
- /bin/bash
.
/run_tests.sh --functional
+ /bin/bash
{toxinidir}/tools
/run_tests.sh --functional
[testenv:functional-py3]
basepython = python3
[testenv:functional-py3]
basepython = python3