diff options
| author |  Michael Lumish <mlumish@google.com> | 2017-05-30 13:53:40 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-30 13:53:40 -0700 |
| commit | 9baf4b19f0e4133dce8e4083fdae4349f6f034da (patch) | |
| tree | b822a700260cfac9bcbcc6cfad709ce94af87e3c /tools | |
| parent | 4ff23545807802f177b2e90c4c4517d8c2cb224e (diff) | |
| parent | 4ff54fa8af36cb4216d4064272597fd28108b31a (diff) | |
Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge
Master 1.3.x upmerge
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 17 | ||||
| -rw-r--r-- | tools/run_tests/generated/tests.json | 24 | ||||
| -rwxr-xr-x | tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh | 1 |
3 files changed, 42 insertions, 0 deletions
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 97e079d8a8..6c4462e9f2 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -1765,6 +1765,23 @@ "headers": [], "is_filegroup": false, "language": "c", + "name": "num_external_connectivity_watchers_test", + "src": [ + "test/core/surface/num_external_connectivity_watchers_test.c" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c", "name": "parse_address_test", "src": [ "test/core/client_channel/parse_address_test.c" diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 82db441a1a..1242025fc2 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -1839,6 +1839,30 @@ ], "cpu_cost": 1.0, "exclude_configs": [], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "gtest": false, + "language": "c", + "name": "num_external_connectivity_watchers_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], "exclude_iomgrs": [], "flaky": false, "gtest": false, diff --git a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh b/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh index 6688025260..ab882d62bc 100755 --- a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh +++ b/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh @@ -41,4 +41,5 @@ ruby src/ruby/end2end/sig_int_during_channel_watch_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/killed_client_thread_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/forking_client_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/grpc_class_init_driver.rb || EXIT_CODE=1 +ruby src/ruby/end2end/multiple_killed_watching_threads_driver.rb || EXIT_CODE=1 exit $EXIT_CODE |