diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-29 08:49:49 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-29 08:49:49 -0700 |
| commit | 4d74056b0806f68397111dc2b16f56386339b8e0 (patch) | |
| tree | 1dbc5b1a713ad69576842b97a3dd1522ae3a23b6 /tools/run_tests | |
| parent | acf0f07dfcb8db090528d6dc4dd7a6f7c1132f30 (diff) | |
| parent | ee98d84a02266acd7da5ed769a7eb3f18599d914 (diff) | |
Merge branch 'forever-is-a-long-time' into tis-but-thy-name
Conflicts:
Makefile
vsprojects/Grpc.mak
Diffstat (limited to 'tools/run_tests')
| -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 ed5a86fb63..9bb9a4a397 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 77db4e3141..b46004d2b3 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", |