diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-18 17:18:36 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-18 17:18:36 +0000 |
| commit | 253a5000ee4c398d7d582b6c9cedf55d09c7b423 (patch) | |
| tree | e7b1451d40766bb378181aa7022b7aa28dd45b00 /tools/run_tests/generated/tests.json | |
| parent | 96e247042576decc655004e8413f670c082a4b1e (diff) | |
| parent | 326a1cdb5a09e9f82fc8a80ce126757ea1166df1 (diff) | |
Merge github.com:grpc/grpc into epexinf
Diffstat (limited to 'tools/run_tests/generated/tests.json')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index f64ea70ac4..4794b14c70 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -4389,7 +4389,9 @@ "windows" ], "cpu_cost": 1.0, - "exclude_configs": [], + "exclude_configs": [ + "tsan" + ], "exclude_iomgrs": [], "flaky": false, "gtest": true, @@ -4401,6 +4403,7 @@ "posix", "windows" ], + "timeout_seconds": 1200, "uses_polling": false }, { @@ -4504,6 +4507,30 @@ "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, |