From 38fb8de100afacbf4c9c00b7f51bfcc763bf366a Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 13 Jul 2016 08:23:32 -0700 Subject: get timeouts working on run_tests.py again --- test/cpp/qps/gen_build_yaml.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'test/cpp') diff --git a/test/cpp/qps/gen_build_yaml.py b/test/cpp/qps/gen_build_yaml.py index 9a58d666b5..140af478bf 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -45,7 +45,7 @@ import performance.scenario_config as scenario_config def _scenario_json_string(scenario_json): # tweak parameters to get fast test times - scenario_json['warmup_seconds'] = 1 + scenario_json['warmup_seconds'] = 0 scenario_json['benchmark_seconds'] = 1 scenarios_json = {'scenarios': [scenario_config.remove_nonproto_fields(scenario_json)]} return json.dumps(scenarios_json) @@ -81,7 +81,8 @@ print yaml.dump({ 'boringssl': True, 'defaults': 'boringssl', 'cpu_cost': guess_cpu(scenario_json), - 'exclude_configs': [] + 'exclude_configs': [], + 'timeout_seconds': 15 } for scenario_json in scenario_config.CXXLanguage().scenarios() ] -- cgit v1.2.3