https://github.com/python/cpython/commit/555dc50c811e3e9ebdc30a1d511cf48a32666d6f
commit: 555dc50c811e3e9ebdc30a1d511cf48a32666d6f
branch: main
author: Sam Gross <[email protected]>
committer: colesbury <[email protected]>
date: 2025-02-06T15:19:00Z
summary:
gh-129694: Add `--parallel-threads` TSAN job to CI (gh-129696)
For now, this just adds a single test suite to the TSAN CI to be run
with `--parallel-threads`.
files:
M .github/workflows/reusable-tsan.yml
M Lib/test/libregrtest/cmdline.py
M Lib/test/libregrtest/main.py
M Lib/test/libregrtest/tsan.py
diff --git a/.github/workflows/reusable-tsan.yml
b/.github/workflows/reusable-tsan.yml
index 1d2548565d50ef..8ac2f84099e563 100644
--- a/.github/workflows/reusable-tsan.yml
+++ b/.github/workflows/reusable-tsan.yml
@@ -74,6 +74,9 @@ jobs:
run: make pythoninfo
- name: Tests
run: ./python -m test --tsan -j4
+ - name: Parallel tests
+ if: fromJSON(inputs.free-threading)
+ run: ./python -m test --tsan-parallel --parallel-threads=4 -j4
- name: Display TSAN logs
if: always()
run: find "${GITHUB_WORKSPACE}" -name 'tsan_log.*' | xargs head -n 1000
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 1f3b2381c71d45..81c7106ac0c0f4 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -168,6 +168,7 @@ def __init__(self, **kwargs) -> None:
self.pgo = False
self.pgo_extended = False
self.tsan = False
+ self.tsan_parallel = False
self.worker_json = None
self.start = None
self.timeout = None
@@ -351,6 +352,9 @@ def _create_parser():
help='enable extended PGO training (slower training)')
group.add_argument('--tsan', dest='tsan', action='store_true',
help='run a subset of test cases that are proper for
the TSAN test')
+ group.add_argument('--tsan-parallel', action='store_true',
+ help='run a subset of test cases that are appropriate '
+ 'for TSAN with `--parallel-threads=N`')
group.add_argument('--fail-env-changed', action='store_true',
help='if a test file alters the environment, mark '
'the test as failed')
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index de377f185f7ed9..2f8fd4c92c119d 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -20,7 +20,7 @@
from .runtests import RunTests, HuntRefleak
from .setup import setup_process, setup_test_dir
from .single import run_single_test, PROGRESS_MIN_TIME
-from .tsan import setup_tsan_tests
+from .tsan import setup_tsan_tests, setup_tsan_parallel_tests
from .utils import (
StrPath, StrJSON, TestName, TestList, TestTuple, TestFilter,
strip_py_suffix, count, format_duration,
@@ -60,6 +60,7 @@ def __init__(self, ns: Namespace, _add_python_opts: bool =
False):
self.pgo: bool = ns.pgo
self.pgo_extended: bool = ns.pgo_extended
self.tsan: bool = ns.tsan
+ self.tsan_parallel: bool = ns.tsan_parallel
# Test results
self.results: TestResults = TestResults()
@@ -195,6 +196,9 @@ def find_tests(self, tests: TestList | None = None) ->
tuple[TestTuple, TestList
if self.tsan:
setup_tsan_tests(self.cmdline_args)
+ if self.tsan_parallel:
+ setup_tsan_parallel_tests(self.cmdline_args)
+
exclude_tests = set()
if self.exclude:
for arg in self.cmdline_args:
diff --git a/Lib/test/libregrtest/tsan.py b/Lib/test/libregrtest/tsan.py
index 00d5779d950e72..1b32deec12bd75 100644
--- a/Lib/test/libregrtest/tsan.py
+++ b/Lib/test/libregrtest/tsan.py
@@ -28,7 +28,18 @@
'test_free_threading.test_slots',
]
+# Tests that should be run with `--parallel-threads=N` under TSAN. These tests
+# typically do not use threads, but are run multiple times in parallel by
+# the regression test runner with the `--parallel-threads` option enabled.
+TSAN_PARALLEL_TESTS = [
+ 'test_abc',
+]
+
def setup_tsan_tests(cmdline_args) -> None:
if not cmdline_args:
cmdline_args[:] = TSAN_TESTS[:]
+
+def setup_tsan_parallel_tests(cmdline_args) -> None:
+ if not cmdline_args:
+ cmdline_args[:] = TSAN_PARALLEL_TESTS[:]
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
