diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-10-16 18:56:50 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-16 18:56:50 +0200 |
| commit | 320e703ad99f450b050ff47558dff9794669500a (patch) | |
| tree | 8d4b429334fe50eb106f40a2dacf48551d51cc27 /test/cpp/qps | |
| parent | 6a89fa1f93356cbe6a009ba11e44496e509a9e08 (diff) | |
| parent | 779ae6f8b78fd2b0b455910fc48198f323e1442f (diff) | |
Merge pull request #12924 from jtattermusch/json_run_localhost_timeouts_sanitizers
More reasonable timeouts for json_run_localhost (poll-cv and sanitizers)
Diffstat (limited to 'test/cpp/qps')
| -rwxr-xr-x | test/cpp/qps/gen_build_yaml.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index 8575fe5a05..65553f57f1 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -78,7 +78,8 @@ print yaml.dump({ 'cpu_cost': guess_cpu(scenario_json, False), 'exclude_configs': ['tsan', 'asan'], 'timeout_seconds': 2*60, - 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) + 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []), + 'auto_timeout_scaling': False } for scenario_json in scenario_config.CXXLanguage().scenarios() if 'scalable' in scenario_json.get('CATEGORIES', []) @@ -95,8 +96,9 @@ print yaml.dump({ 'defaults': 'boringssl', 'cpu_cost': guess_cpu(scenario_json, True), 'exclude_configs': sorted(c for c in configs_from_yaml if c not in ('tsan', 'asan')), - 'timeout_seconds': 2*60, - 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) + 'timeout_seconds': 10*60, + 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []), + 'auto_timeout_scaling': False } for scenario_json in scenario_config.CXXLanguage().scenarios() if 'scalable' in scenario_json.get('CATEGORIES', []) |