diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-06 14:43:06 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-06 14:43:06 -0700 |
| commit | f39f2d6ddef77b407bf17cb7be8c21cc5b37d889 (patch) | |
| tree | 1238134b8a02139de6ad2efbe809c73a2fe66772 /tools/run_tests | |
| parent | f50abfcbc246d9f338b800f2b1c2365520f34e3f (diff) | |
| parent | cce361f7ca984200b32738fda355fede7a2ecd58 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
test/core/bad_client/bad_client.c
test/core/httpcli/httpcli_test.c
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/tests.json | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 81d32d3edb..7eed8a289f 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -351,6 +351,15 @@ { "flaky": false, "language": "c", + "name": "httpcli_test", + "platforms": [ + "windows", + "posix" + ] + }, + { + "flaky": false, + "language": "c", "name": "json_rewrite_test", "platforms": [ "windows", @@ -4673,6 +4682,15 @@ "windows", "posix" ] + }, + { + "flaky": false, + "language": "c", + "name": "initial_settings_frame_bad_client_test", + "platforms": [ + "windows", + "posix" + ] } ] |