summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-04-16 13:16:39 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-04-16 13:16:39 +0000
commit9d7d803bbefed364ad58b4b5b5305f4e210bb5e1 (patch)
tree1c6adeda0ffc35aa6da203cdfb4c89b22b9edff1
parent2acfbade27fbd1da21a289cb102a77eaccfc900d (diff)
parent218a7793090bfa19d8704b4c6cbf944ba8da4d47 (diff)
downloadbuildstream-9d7d803bbefed364ad58b4b5b5305f4e210bb5e1.tar.gz
Merge branch 'phil/fix-empty-external-tests' into 'master'
Fix empty external tests See merge request BuildStream/buildstream!1295
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 82e0f13ee..c083ef58e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,8 @@ commands =
py{35,36,37}-!external-!nocover: pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
py{35,36,37}-!nocover: mkdir -p .coverage-reports
external-!nocover: {envpython} {toxinidir}/tests/external_plugins.py {envtmpdir} --cov=buildstream --cov-append {posargs}
- py{35,36,37}-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
+ py{35,36,37}-!external-!nocover: mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
+ py{35,36,37}-external-!nocover: - mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
# Running with coverage reporting disabled
py{35,36,37}-!external-nocover: pytest --basetemp {envtmpdir} {posargs}
external-nocover: {envpython} {toxinidir}/tests/external_plugins.py {envtmpdir} {posargs}