diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-12-15 06:05:30 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-12-15 06:05:30 -0800 |
| commit | 7954e360594eb9a184127ed3e3364ab26888cd83 (patch) | |
| tree | d1c39c94d4fdfb5d75f7e495b22418f4fe13dc2b /tools/run_tests | |
| parent | c10d68d27beaa0935918d0819cd776b98f7b8300 (diff) | |
| parent | 80428e6d1cd0007ea032f1f1cc46fba8c4d07610 (diff) | |
Merge github.com:grpc/grpc into proxy-crash
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 75 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 32 |
2 files changed, 107 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index cd11c5dc5a..2ea8715c80 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -17278,6 +17278,64 @@ ] }, { + "deps": [ + "bad_ssl_test_server", + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "bad_ssl_alpn_server", + "src": [ + "test/core/bad_ssl/servers/alpn.c" + ] + }, + { + "deps": [ + "bad_ssl_test_server", + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "bad_ssl_cert_server", + "src": [ + "test/core/bad_ssl/servers/cert.c" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "bad_ssl_alpn_test", + "src": [ + "test/core/bad_ssl/bad_ssl_test.c" + ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "language": "c", + "name": "bad_ssl_cert_test", + "src": [ + "test/core/bad_ssl/bad_ssl_test.c" + ] + }, + { "deps": [], "headers": [ "include/grpc/support/alloc.h", @@ -20844,5 +20902,22 @@ "test/core/bad_client/bad_client.c", "test/core/bad_client/bad_client.h" ] + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [ + "test/core/bad_ssl/server.h" + ], + "language": "c", + "name": "bad_ssl_test_server", + "src": [ + "test/core/bad_ssl/server.c", + "test/core/bad_ssl/server.h" + ] } ] diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index b43cc62845..5f75accbee 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -18427,5 +18427,37 @@ "posix", "windows" ] + }, + { + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "exclude_configs": [], + "flaky": false, + "language": "c", + "name": "bad_ssl_alpn_test", + "platforms": [ + "linux", + "mac", + "posix" + ] + }, + { + "ci_platforms": [ + "linux", + "mac", + "posix" + ], + "exclude_configs": [], + "flaky": false, + "language": "c", + "name": "bad_ssl_cert_test", + "platforms": [ + "linux", + "mac", + "posix" + ] } ] |