diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-02-24 15:33:51 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-24 15:33:51 -0800 |
| commit | f2cf3d94a1a46db2ebb2c13c3476e58ecdae6006 (patch) | |
| tree | 4bcc8b6e8059abfafe821eda82d313a2818af97a | |
| parent | c240e6cd11349a4bb4bfd01df235b1dd1e424f29 (diff) | |
| parent | 122e4500d1761d9d233ef2701543b5e11cd6f1d3 (diff) | |
Merge pull request #9747 from ctiller/splitsies
Increase timeout for bm_fullstack
| -rw-r--r-- | build.yaml | 4 | ||||
| -rw-r--r-- | templates/tools/run_tests/generated/tests.json.template | 30 | ||||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 7 |
3 files changed, 30 insertions, 11 deletions
diff --git a/build.yaml b/build.yaml index 588b07b3ed..3e2dca5b1c 100644 --- a/build.yaml +++ b/build.yaml @@ -3051,10 +3051,14 @@ targets: - gpr args: - --benchmark_min_time=0 + excluded_poll_engines: + - poll + - poll-cv platforms: - mac - linux - posix + timeout_seconds: 1200 - name: channel_arguments_test gtest: true build: test diff --git a/templates/tools/run_tests/generated/tests.json.template b/templates/tools/run_tests/generated/tests.json.template index 2815dbb9b3..10ab2e445a 100644 --- a/templates/tools/run_tests/generated/tests.json.template +++ b/templates/tools/run_tests/generated/tests.json.template @@ -2,18 +2,28 @@ --- | <%! import json + + def gen_one_target(tgt): + out = {"name": tgt.name, + "language": tgt.language, + "platforms": tgt.platforms, + "ci_platforms": tgt.ci_platforms, + "gtest": tgt.gtest, + "exclude_configs": tgt.get("exclude_configs", []), + "exclude_iomgrs": tgt.get("exclude_iomgrs", []), + "args": tgt.get("args", []), + "flaky": tgt.flaky, + "cpu_cost": tgt.get("cpu_cost", 1.0)} + timeout_seconds = tgt.get("timeout_seconds", None) + if timeout_seconds: + out['timeout_seconds'] = timeout_seconds + excluded_poll_engines = tgt.get("excluded_poll_engines", None) + if excluded_poll_engines: + out['excluded_poll_engines'] = excluded_poll_engines + return out %> - ${json.dumps([{"name": tgt.name, - "language": tgt.language, - "platforms": tgt.platforms, - "ci_platforms": tgt.ci_platforms, - "gtest": tgt.gtest, - "exclude_configs": tgt.get("exclude_configs", []), - "exclude_iomgrs": tgt.get("exclude_iomgrs", []), - "args": tgt.get("args", []), - "flaky": tgt.flaky, - "cpu_cost": tgt.get("cpu_cost", 1.0)} + ${json.dumps([gen_one_target(tgt) for tgt in targets if tgt.get('run', True) and tgt.build == 'test'] + tests, diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 103a379c5c..b2b41413ac 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -2525,6 +2525,10 @@ "cpu_cost": 1.0, "exclude_configs": [], "exclude_iomgrs": [], + "excluded_poll_engines": [ + "poll", + "poll-cv" + ], "flaky": false, "gtest": false, "language": "c++", @@ -2555,7 +2559,8 @@ "linux", "mac", "posix" - ] + ], + "timeout_seconds": 1200 }, { "args": [], |