diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-01 15:27:24 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-02-01 15:27:24 -0800 |
| commit | 3a63d4c005c1dba4f021a7ecfc7f1481fb703527 (patch) | |
| tree | 49ecd51acc3feafb09437ab45dfb74dd493ff568 /test/cpp | |
| parent | 27ffc9b551f4df23598b8b9819012bfc57a3da88 (diff) | |
| parent | d505b53e4cfcac42a17b1a94f006c44bb91a1009 (diff) | |
Merge github.com:grpc/grpc into bwest
Diffstat (limited to 'test/cpp')
| -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 188d6196e5..2f035abedd 100755 --- a/test/cpp/qps/gen_build_yaml.py +++ b/test/cpp/qps/gen_build_yaml.py @@ -92,7 +92,8 @@ print yaml.dump({ 'defaults': 'boringssl', 'cpu_cost': guess_cpu(scenario_json, False), 'exclude_configs': ['tsan', 'asan'], - 'timeout_seconds': 6*60 + 'timeout_seconds': 6*60, + 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) } for scenario_json in scenario_config.CXXLanguage().scenarios() if 'scalable' in scenario_json.get('CATEGORIES', []) @@ -109,8 +110,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': 6*60 - } + 'timeout_seconds': 6*60, + 'excluded_poll_engines': scenario_json.get('EXCLUDED_POLL_ENGINES', []) + } for scenario_json in scenario_config.CXXLanguage().scenarios() if 'scalable' in scenario_json.get('CATEGORIES', []) ] |