X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/ed9d58b7410f24446cedebd0f767b71b154f5f5b..bd7f49df3e16b52f0b287c28427c306e6c1064c8:/tox.ini?ds=sidebyside

diff --git a/tox.ini b/tox.ini
index 9bb809a..3ea4da8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,23 @@
 [tox]
-envlist = py{36,37,38,39},fuzz
+envlist = {,ci-}py{36,37,38,39},fuzz
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 deps =
     -r{toxinidir}/test_requirements.txt
+; parallelization is disabled on CI because pytest-dev/pytest-xdist#620 occurs too frequently
+; local runs can stay parallelized since they aren't rolling the dice so many times as like on CI
 commands =
-    pip install -e .[d,python2]
+    pip install -e .[d]
     coverage erase
-    coverage run -m pytest tests
+    pytest tests --run-optional no_python2 \
+        !ci: --numprocesses auto \
+        --cov {posargs}
+    pip install -e .[d,python2]
+    pytest tests --run-optional python2 \
+        !ci: --numprocesses auto \
+        --cov --cov-append {posargs}
     coverage report
 
 [testenv:fuzz]
@@ -23,4 +31,4 @@ commands =
     pip install -e .[d]
     coverage erase
     coverage run fuzz.py
-    coverage report
\ No newline at end of file
+    coverage report