diff options
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index a377c7faab..daf350b411 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -122,7 +122,7 @@ def max_parallel_tests_for_current_platform(): # so far on windows. if jobset.platform_string() == 'windows': return 64 - return 128 + return 1024 # SimpleConfig: just compile with CONFIG=config, and run the binary to test class Config(object): @@ -159,8 +159,8 @@ class Config(object): environ=actual_environ, cpu_cost=cpu_cost, timeout_seconds=(self.timeout_multiplier * timeout_seconds if timeout_seconds else None), - flake_retries=5 if flaky or args.allow_flakes else 0, - timeout_retries=3 if flaky or args.allow_flakes else 0) + flake_retries=4 if flaky or args.allow_flakes else 0, + timeout_retries=1 if flaky or args.allow_flakes else 0) def get_c_tests(travis, test_lang) : @@ -284,6 +284,7 @@ class CLanguage(object): if self._use_cmake and target.get('boringssl', False): # cmake doesn't build boringssl tests continue + auto_timeout_scaling = target.get('auto_timeout_scaling', True) polling_strategies = (_POLLING_STRATEGIES.get(self.platform, ['all']) if target.get('uses_polling', True) else ['none']) @@ -299,7 +300,8 @@ class CLanguage(object): env['GRPC_DNS_RESOLVER'] = resolver shortname_ext = '' if polling_strategy=='all' else ' GRPC_POLL_STRATEGY=%s' % polling_strategy timeout_scaling = 1 - if polling_strategy == 'poll-cv': + + if auto_timeout_scaling and polling_strategy == 'poll-cv': timeout_scaling *= 5 if polling_strategy in target.get('excluded_poll_engines', []): @@ -307,12 +309,12 @@ class CLanguage(object): # Scale overall test timeout if running under various sanitizers. config = self.args.config - if ('asan' in config - or config == 'msan' - or config == 'tsan' - or config == 'ubsan' - or config == 'helgrind' - or config == 'memcheck'): + if auto_timeout_scaling and ('asan' in config + or config == 'msan' + or config == 'tsan' + or config == 'ubsan' + or config == 'helgrind' + or config == 'memcheck'): timeout_scaling *= 20 if self.config.build_config in target['exclude_configs']: @@ -1493,7 +1495,7 @@ def build_step_environ(cfg): return environ build_steps = list(set( - jobset.JobSpec(cmdline, environ=build_step_environ(build_config), flake_retries=5) + jobset.JobSpec(cmdline, environ=build_step_environ(build_config), flake_retries=2) for l in languages for cmdline in l.pre_build_steps())) if make_targets: |