aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-11 09:50:27 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-11 09:50:27 -0700
commit28157f806cce895da0fbfa18f440eed11c41b58f (patch)
treea30cf2e7cd82a5ff4932ed424cb2534f89b0550f /templates
parentc9f987426daff98d47aca3d8d2753a16de0ba520 (diff)
parent1ec8f8a9204e3380b025d4c059a4887c388e8582 (diff)
Merge branch 'timer' into pid++
Diffstat (limited to 'templates')
-rw-r--r--templates/tools/run_tests/generated/tests.json.template3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/tools/run_tests/generated/tests.json.template b/templates/tools/run_tests/generated/tests.json.template
index 10ab2e445a..0c9f0a14c4 100644
--- a/templates/tools/run_tests/generated/tests.json.template
+++ b/templates/tools/run_tests/generated/tests.json.template
@@ -13,7 +13,8 @@
"exclude_iomgrs": tgt.get("exclude_iomgrs", []),
"args": tgt.get("args", []),
"flaky": tgt.flaky,
- "cpu_cost": tgt.get("cpu_cost", 1.0)}
+ "cpu_cost": tgt.get("cpu_cost", 1.0),
+ "uses_polling": tgt.get("uses_polling", True)}
timeout_seconds = tgt.get("timeout_seconds", None)
if timeout_seconds:
out['timeout_seconds'] = timeout_seconds