diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-20 15:42:17 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-20 15:42:17 -0800 |
| commit | 12fc53f21f830f409e01491502fe1f1f51b5bbe9 (patch) | |
| tree | 5d467aaf7427b86976c11caa0d16ec1c1e2a9af9 /templates/tools/run_tests | |
| parent | e5af172eea5d5b97d72443520912f14f704209a7 (diff) | |
| parent | 4c70fe71872c34383581d9491312cc3f9860c558 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'templates/tools/run_tests')
| -rw-r--r-- | templates/tools/run_tests/tests.json.template | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/tools/run_tests/tests.json.template b/templates/tools/run_tests/tests.json.template index 3a3ac1e0f3..9a84783467 100644 --- a/templates/tools/run_tests/tests.json.template +++ b/templates/tools/run_tests/tests.json.template @@ -10,7 +10,8 @@ "ci_platforms": tgt.ci_platforms, "exclude_configs": tgt.get("exclude_configs", []), "args": [], - "flaky": tgt.flaky} + "flaky": tgt.flaky, + "cpu_cost": tgt.get("cpu_cost", 1.0)} for tgt in targets if tgt.get('run', True) and tgt.build == 'test'] + tests, |