From 3f06e3f8a686b9ebcb9663faf4e2f939bb45d759 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 16 Feb 2017 11:16:03 -0800
Subject: Increase timeout for bm_fullstack

---
 build.yaml                                         |  1 +
 .../tools/run_tests/generated/tests.json.template  | 27 ++++++++++++++--------
 tools/run_tests/generated/tests.json               |  3 ++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/build.yaml b/build.yaml
index 48fe927f5f..61b3c02510 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3023,6 +3023,7 @@ targets:
   - 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..ca483b30a6 100644
--- a/templates/tools/run_tests/generated/tests.json.template
+++ b/templates/tools/run_tests/generated/tests.json.template
@@ -2,18 +2,25 @@
 --- |
   <%!
   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
+    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 a161e8a670..bca0b22d39 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2511,7 +2511,8 @@
       "linux", 
       "mac", 
       "posix"
-    ]
+    ], 
+    "timeout_seconds": 1200
   }, 
   {
     "args": [], 
-- 
cgit v1.2.3


From 122e4500d1761d9d233ef2701543b5e11cd6f1d3 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 22 Feb 2017 10:22:32 -0800
Subject: Exclude poll, poll-cv for bm_fullstack (its not interesting)

---
 build.yaml                                              | 3 +++
 templates/tools/run_tests/generated/tests.json.template | 3 +++
 tools/run_tests/generated/tests.json                    | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/build.yaml b/build.yaml
index b45816ae5d..19aec04698 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3012,6 +3012,9 @@ targets:
   - gpr
   args:
   - --benchmark_min_time=0
+  excluded_poll_engines:
+  - poll
+  - poll-cv
   platforms:
   - mac
   - linux
diff --git a/templates/tools/run_tests/generated/tests.json.template b/templates/tools/run_tests/generated/tests.json.template
index ca483b30a6..10ab2e445a 100644
--- a/templates/tools/run_tests/generated/tests.json.template
+++ b/templates/tools/run_tests/generated/tests.json.template
@@ -17,6 +17,9 @@
     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
   %>
 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 3f791efc5d..33d7ece3fc 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2503,6 +2503,10 @@
     "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
+    "excluded_poll_engines": [
+      "poll", 
+      "poll-cv"
+    ], 
     "flaky": false, 
     "gtest": false, 
     "language": "c++", 
-- 
cgit v1.2.3