|
21 | 21 | from test.libregrtest.setup import setup_tests
|
22 | 22 | from test.libregrtest.utils import format_duration, print_warning
|
23 | 23 |
|
| 24 | +if sys.platform == 'win32': |
| 25 | + import locale |
| 26 | + |
24 | 27 |
|
25 | 28 | # Display the running tests if nothing happened last N seconds
|
26 | 29 | PROGRESS_UPDATE = 30.0 # seconds
|
@@ -259,11 +262,16 @@ def _run_process(self, test_name: str, stdout_fh: TextIO) -> int:
|
259 | 262 | self.current_test_name = None
|
260 | 263 |
|
261 | 264 | def _runtest(self, test_name: str) -> MultiprocessResult:
|
| 265 | + if sys.platform == 'win32': |
| 266 | + # gh-95027: When stdout is not a TTY, Python uses the ANSI code |
| 267 | + # page for the sys.stdout encoding. If the main process runs in a |
| 268 | + # terminal, sys.stdout uses WindowsConsoleIO with UTF-8 encoding. |
| 269 | + encoding = locale.getencoding() |
| 270 | + else: |
| 271 | + encoding = sys.stdout.encoding |
262 | 272 | # gh-94026: Write stdout+stderr to a tempfile as workaround for
|
263 | 273 | # non-blocking pipes on Emscripten with NodeJS.
|
264 |
| - with tempfile.TemporaryFile( |
265 |
| - 'w+', encoding=sys.stdout.encoding |
266 |
| - ) as stdout_fh: |
| 274 | + with tempfile.TemporaryFile('w+', encoding=encoding) as stdout_fh: |
267 | 275 | # gh-93353: Check for leaked temporary files in the parent process,
|
268 | 276 | # since the deletion of temporary files can happen late during
|
269 | 277 | # Python finalization: too late for libregrtest.
|
|
0 commit comments