diff options
| author | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2017-07-14 14:24:02 +0200 |
|---|---|---|
| committer | Oliver Bestwalter <oliver.bestwalter@avira.com> | 2017-07-14 14:24:02 +0200 |
| commit | 526738ba0d24ce716d8b1d8c29d52f55ed189dae (patch) | |
| tree | 5e1a2c952ac170cb7813dbfe6ef7d5c59c817d15 | |
| parent | 04c34a61f93f020965e7e0ed298aa951368e561a (diff) | |
| download | tox-git-526738ba0d24ce716d8b1d8c29d52f55ed189dae.tar.gz | |
#429: pass MSYSTEM on Windows
| -rw-r--r-- | doc/config.txt | 2 | ||||
| -rw-r--r-- | tests/test_config.py | 1 | ||||
| -rwxr-xr-x | tox/config.py | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/config.txt b/doc/config.txt index 1cc6d3d0..2a7a1465 100644 --- a/doc/config.txt +++ b/doc/config.txt @@ -220,7 +220,7 @@ Complete list of settings that you can put into ``testenv*`` sections: * passed through on all platforms: ``PATH``, ``LANG``, ``LANGUAGE``, ``LD_LIBRARY_PATH``, ``PIP_INDEX_URL`` * Windows: ``SYSTEMDRIVE``, ``SYSTEMROOT``, ``PATHEXT``, ``TEMP``, ``TMP`` - ``NUMBER_OF_PROCESSORS``, ``USERPROFILE`` + ``NUMBER_OF_PROCESSORS``, ``USERPROFILE``, ``MSYSTEM`` * Others (e.g. UNIX, macOS): ``TMPDIR`` You can override these variables with the ``setenv`` option. diff --git a/tests/test_config.py b/tests/test_config.py index 54d11367..3416d0d4 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -876,6 +876,7 @@ class TestConfigTestEnv: assert "TMP" in envconfig.passenv assert "NUMBER_OF_PROCESSORS" in envconfig.passenv assert "USERPROFILE" in envconfig.passenv + assert "MSYSTEM" in envconfig.passenv else: assert "TMPDIR" in envconfig.passenv assert "PATH" in envconfig.passenv diff --git a/tox/config.py b/tox/config.py index 2f5d52ac..33bf14f2 100755 --- a/tox/config.py +++ b/tox/config.py @@ -492,7 +492,8 @@ def tox_addoption(parser): # for `multiprocessing.cpu_count()` on Windows # (prior to Python 3.4). passenv.add("NUMBER_OF_PROCESSORS") - passenv.add("USERPROFILE") # needed for `os.path.expanduser()`. + passenv.add("USERPROFILE") # needed for `os.path.expanduser()` + passenv.add("MSYSTEM") # fixes #429 else: passenv.add("TMPDIR") for spec in value: |