diff options
| author |  Siddharth Rakesh <sidrakesh@google.com> | 2015-06-30 20:26:58 -0700 |
|---|---|---|
| committer | Siddharth Rakesh <sidrakesh@google.com> | 2015-06-30 20:26:58 -0700 |
| commit | f8857de3395760f8e3ec179556902d0cb37bc42a (patch) | |
| tree | 2b117dccede5365eb32e9fbd28dfe0eaf3a49a75 /tools | |
| parent | fd1a20a667fc2cfdfe2afd8a8d54cb3f5438b5df (diff) | |
| parent | 23ca82ab54e0f5386c1a6b9233e6864121415280 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 28 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 17 |
2 files changed, 45 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 675a2fb3b9..453cb6e7fd 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -136,6 +136,20 @@ ], "headers": [], "language": "c", + "name": "fd_conservation_posix_test", + "src": [ + "test/core/iomgr/fd_conservation_posix_test.c" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", "name": "fd_posix_test", "src": [ "test/core/iomgr/fd_posix_test.c" @@ -726,6 +740,20 @@ { "deps": [ "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "multiple_server_queues_test", + "src": [ + "test/core/end2end/multiple_server_queues_test.c" + ] + }, + { + "deps": [ + "gpr", "gpr_test_util" ], "headers": [], diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 2da8b56d4f..432b908bd6 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -84,6 +84,14 @@ { "flaky": false, "language": "c", + "name": "fd_conservation_posix_test", + "platforms": [ + "posix" + ] + }, + { + "flaky": false, + "language": "c", "name": "fd_posix_test", "platforms": [ "posix" @@ -413,6 +421,15 @@ { "flaky": false, "language": "c", + "name": "multiple_server_queues_test", + "platforms": [ + "windows", + "posix" + ] + }, + { + "flaky": false, + "language": "c", "name": "murmur_hash_test", "platforms": [ "windows", |