diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-16 15:42:41 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-16 15:42:41 -0700 |
| commit | 48bed5ec63a3a2c78170d3e24530558c1c93d666 (patch) | |
| tree | adfbeccf48a3b84c06cc5fd145a165ef45a59ca5 /tools/run_tests/generated/tests.json | |
| parent | fdfab883c3875e29d4607ad37c0b05b691a96b46 (diff) | |
Fix merge
Diffstat (limited to 'tools/run_tests/generated/tests.json')
| -rw-r--r-- | tools/run_tests/generated/tests.json | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 34d2abb4b3..8c4f3f79e4 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -2731,6 +2731,29 @@ "ci_platforms": [ "linux", "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c", + "name": "transport_metadata_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", "posix" ], "cpu_cost": 1.0, @@ -4279,29 +4302,6 @@ "flaky": false, "gtest": false, "language": "c++", - "name": "transport_metadata_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": true - }, - { - "args": [], - "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", |