diff options
| author | Thomas Waldmann <tw@waldmann-edv.de> | 2017-01-15 01:15:04 +0100 |
|---|---|---|
| committer | Thomas Waldmann <tw@waldmann-edv.de> | 2017-01-15 01:15:04 +0100 |
| commit | 740312f725c16fde3bdf34c4a6def3ade28076bf (patch) | |
| tree | ca6af8ac56189e07a81f0f927b2a928c8c91f863 /tox.ini | |
| parent | 29a9e995e69cebbcb6d37db1c796803baf777c12 (diff) | |
| parent | e022cf117c649761fb2169f0b9d021f78e7f7fd8 (diff) | |
Merge branch '1.0-maint' into merge-1.0-maint
# Conflicts:
# requirements.d/development.txt
# tox.ini
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -9,7 +9,7 @@ deps = -rrequirements.d/development.txt -rrequirements.d/attic.txt -rrequirements.d/fuse.txt -commands = py.test -n 8 -rs --cov=borg --cov-config=.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} +commands = py.test -n {env:XDISTN:4} -rs --cov=borg --cov-config=.coveragerc --benchmark-skip --pyargs {posargs:borg.testsuite} # fakeroot -u needs some env vars: passenv = * |