From c2007573dd449ae054f9fd5227e49ac9eef00ae8 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 13 Jun 2022 19:51:04 +0200 Subject: [PATCH] gh-84461: Fix parallel testing on WebAssembly (GH-93768) --- Lib/test/libregrtest/main.py | 13 +++++++++---- Tools/scripts/run_tests.py | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index 0cacccfc0b5..85bf6e1d48e 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -628,11 +628,16 @@ class Regrtest: # Define a writable temp dir that will be used as cwd while running # the tests. The name of the dir includes the pid to allow parallel # testing (see the -j option). - pid = os.getpid() - if self.worker_test_name is not None: - test_cwd = 'test_python_worker_{}'.format(pid) + # Emscripten and WASI have stubbed getpid(), Emscripten has only + # milisecond clock resolution. Use randint() instead. + if sys.platform in {"emscripten", "wasi"}: + nounce = random.randint(0, 1_000_000) else: - test_cwd = 'test_python_{}'.format(pid) + nounce = os.getpid() + if self.worker_test_name is not None: + test_cwd = 'test_python_worker_{}'.format(nounce) + else: + test_cwd = 'test_python_{}'.format(nounce) test_cwd += os_helper.FS_NONASCII test_cwd = os.path.join(self.tmp_dir, test_cwd) return test_cwd diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py index 8dbcade9238..445a34ae3e8 100644 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -63,9 +63,9 @@ def main(regrtest_args): args.append('-n') # Silence alerts under Windows if not any(is_multiprocess_flag(arg) for arg in regrtest_args): if cross_compile and hostrunner: - # For now use only one core for cross-compiled builds; + # For now use only two cores for cross-compiled builds; # hostrunner can be expensive. - args.extend(['-j', '1']) + args.extend(['-j', '2']) else: args.extend(['-j', '0']) # Use all CPU cores if not any(is_resource_use_flag(arg) for arg in regrtest_args):