summaryrefslogtreecommitdiffstats
path: root/Tools/scripts
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2023-09-26 15:22:50 (GMT)
committerGitHub <noreply@github.com>2023-09-26 15:22:50 (GMT)
commit859618c8cd5de86a975e68d7e5d20c04bc5db2e5 (patch)
treed46b75bdda563aead0bd9587387905b3dea37d59 /Tools/scripts
parent19bf3986958fc8269a1eb6d741bb60c91d6b5e58 (diff)
downloadcpython-859618c8cd5de86a975e68d7e5d20c04bc5db2e5.zip
cpython-859618c8cd5de86a975e68d7e5d20c04bc5db2e5.tar.gz
cpython-859618c8cd5de86a975e68d7e5d20c04bc5db2e5.tar.bz2
gh-109566, regrtest: Add --fast-ci and --slow-ci options (#109570)
* Add --fast-ci and --slow-ci options to libregrtest: * --fast-ci uses a default timeout of 10 minutes and "-u all,-cpu" (skip slowest tests). * --slow-ci uses a default timeout of 20 minues and "-u all" (run all tests). * regrtest header now lists test resources. * Makefile changes: * "make test", "make hostrunnertest" and "make coverage-report" now use --fast-ci option and TESTTIMEOUT variable. * "make buildbottest" now uses "--slow-ci". Remove options which became redundant with "--slow-ci". * "make testall" and "make testuniversal" now use --slow-ci option and TESTTIMEOUT variable. * "make testall" now uses "find -exec rm ..." instead of "find ... -print|xargs rm ...", same as "make clean". * GitHub Actions workflow: * Ubuntu and Address Sanitizer jobs now use "make test". Remove options which became redundant with "--fast-ci". * Windows jobs now use --fast-ci option. * Use -j0 to detect the number of CPUs. * Set Makefile TESTTIMEOUT default to an empty string, since --slow-ci and --fast-ci use different default timeout. It's now accepted to pass "--timeout=" to regrtest: treated as not timeout. * Tools/scripts/run_tests.py now uses --fast-ci option. * Tools/buildbot/test.bat now uses --slow-ci option. Remove --timeout=1200 option, redundant with --slow-ci.
Diffstat (limited to 'Tools/scripts')
-rw-r--r--Tools/scripts/run_tests.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py
index 445a34a..c62ae82 100644
--- a/Tools/scripts/run_tests.py
+++ b/Tools/scripts/run_tests.py
@@ -18,9 +18,6 @@ def is_multiprocess_flag(arg):
return arg.startswith('-j') or arg.startswith('--multiprocess')
-def is_resource_use_flag(arg):
- return arg.startswith('-u') or arg.startswith('--use')
-
def is_python_flag(arg):
return arg.startswith('-p') or arg.startswith('--python')
@@ -56,20 +53,13 @@ def main(regrtest_args):
args.extend(test.support.args_from_interpreter_flags())
args.extend(['-m', 'test', # Run the test suite
- '-r', # Randomize test order
- '-w', # Re-run failed tests in verbose mode
+ '--fast-ci', # Fast Continuous Integration mode
])
- if sys.platform == 'win32':
- 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 two cores for cross-compiled builds;
# hostrunner can be expensive.
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):
- args.extend(['-u', 'all,-largefile,-audio,-gui'])
if cross_compile and hostrunner:
# If HOSTRUNNER is set and -p/--python option is not given, then