diff options
author | Victor Stinner <vstinner@python.org> | 2023-09-13 00:24:43 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-13 00:24:43 (GMT) |
commit | 715f6632589fc69595ed7fde847e5405925fb94b (patch) | |
tree | 2dd4db877378af8ae38a82a0c5f70336ff062ccb /Lib/test/pythoninfo.py | |
parent | 75cdd9a904bbed9ac3bf02ef53b1c4c58aeee4d0 (diff) | |
download | cpython-715f6632589fc69595ed7fde847e5405925fb94b.zip cpython-715f6632589fc69595ed7fde847e5405925fb94b.tar.gz cpython-715f6632589fc69595ed7fde847e5405925fb94b.tar.bz2 |
gh-109276: libregrtest: WASM use stdout for JSON (#109355)
On Emscripten and WASI, or if --python command line is used,
libregrtest now writes JSON into stdout, instead of using a name
file.
* Add JsonFileType.STDOUT.
* Remove JsonFileType.FILENAME.
* test.pythoninfo logs environment variables related to
cross-compilation and running Python on Emscripten/WASI.
Diffstat (limited to 'Lib/test/pythoninfo.py')
-rw-r--r-- | Lib/test/pythoninfo.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index ea3a78a..f16b798 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -268,6 +268,7 @@ def collect_os(info_add): "ARCHFLAGS", "ARFLAGS", "AUDIODEV", + "BUILDPYTHON", "CC", "CFLAGS", "COLUMNS", @@ -320,6 +321,7 @@ def collect_os(info_add): "VIRTUAL_ENV", "WAYLAND_DISPLAY", "WINDIR", + "_PYTHON_HOSTRUNNER", "_PYTHON_HOST_PLATFORM", "_PYTHON_PROJECT_BASE", "_PYTHON_SYSCONFIGDATA_NAME", @@ -335,7 +337,8 @@ def collect_os(info_add): for name, value in os.environ.items(): uname = name.upper() if (uname in ENV_VARS - # Copy PYTHON* and LC_* variables + # Copy PYTHON* variables like PYTHONPATH + # Copy LC_* variables like LC_ALL or uname.startswith(("PYTHON", "LC_")) # Visual Studio: VS140COMNTOOLS or (uname.startswith("VS") and uname.endswith("COMNTOOLS"))): @@ -500,6 +503,7 @@ def collect_sysconfig(info_add): 'CFLAGS', 'CFLAGSFORSHARED', 'CONFIG_ARGS', + 'HOSTRUNNER', 'HOST_GNU_TYPE', 'MACHDEP', 'MULTIARCH', |