diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-18 13:40:55 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-18 13:40:55 -0700 |
| commit | 40ad5ea96c99425c018fe2885dab3fcb6a21f56f (patch) | |
| tree | c39fa37d855d22cf5dbac378c1b7fc7c896b78e8 /tools/run_tests/generated/tests.json | |
| parent | be717835077059535c93ba89af45983b9c2997a4 (diff) | |
| parent | 0d1150855d5c812d649111a4675ad0c444dafdc4 (diff) | |
Merge github.com:grpc/grpc into tfix2
Diffstat (limited to 'tools/run_tests/generated/tests.json')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 79 |
1 files changed, 53 insertions, 26 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index d690433d5e..2b21215108 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -2867,31 +2867,7 @@ "posix", "windows" ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "transport_pid_controller_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false + "uses_polling": true }, { "args": [], @@ -4361,7 +4337,9 @@ "windows" ], "cpu_cost": 1.0, - "exclude_configs": [], + "exclude_configs": [ + "tsan" + ], "exclude_iomgrs": [], "flaky": false, "gtest": true, @@ -4373,6 +4351,7 @@ "posix", "windows" ], + "timeout_seconds": 1200, "uses_polling": false }, { @@ -4476,6 +4455,54 @@ "ci_platforms": [ "linux", "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c++", + "name": "transport_pid_controller_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "vector_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", "posix" ], "cpu_cost": 0.5, |