diff options
| author | Victor Stinner <vstinner@python.org> | 2023-09-27 10:01:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 10:01:16 (GMT) |
| commit | 91fb8daa2494df4dd6a841ca8c742a03175c7ecd (patch) | |
| tree | 69cf7d8fc8f8108ac9804f690849856bf88563dd /Lib/test/libregrtest/main.py | |
| parent | b1aebf1e6576680d606068d17e2208259573e061 (diff) | |
| download | cpython-91fb8daa2494df4dd6a841ca8c742a03175c7ecd.zip cpython-91fb8daa2494df4dd6a841ca8c742a03175c7ecd.tar.gz cpython-91fb8daa2494df4dd6a841ca8c742a03175c7ecd.tar.bz2 | |
gh-109566: Fix regrtest Python options for WASM/WASI (#109954)
WASM and WASI buildbots use multiple PYTHON environment variables
such as PYTHONPATH and _PYTHON_HOSTRUNNER. Don't use -E if the
--python=COMMAND option is used.
Diffstat (limited to 'Lib/test/libregrtest/main.py')
| -rw-r--r-- | Lib/test/libregrtest/main.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index c31d5ff..45a68a8 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -504,9 +504,12 @@ class Regrtest: if sys.flags.bytes_warning < 2: python_opts.append('-bb') - # Ignore PYTHON* environment variables - if not sys.flags.ignore_environment: - python_opts.append('-E') + # WASM/WASI buildbot builders pass multiple PYTHON environment + # variables such as PYTHONPATH and _PYTHON_HOSTRUNNER. + if not self.python_cmd: + # Ignore PYTHON* environment variables + if not sys.flags.ignore_environment: + python_opts.append('-E') if not python_opts: return |