aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-11-02 08:42:23 -0700
committerGravatar GitHub <noreply@github.com>2016-11-02 08:42:23 -0700
commit57f30d15185f030de0c71d6a39e533d418b2a22e (patch)
tree0b4f779a3439b3d71e51c1d3523bca1eb135d937 /tools
parent105b39450aa03a55af537a4a85220e7bf5e48f70 (diff)
parent754b2b88bc7bf35629573ba46a9600e385cd7100 (diff)
Merge pull request #8523 from markdroth/lb_policy_name_channel_arg
Allow setting LB policy name via the C++ API
Diffstat (limited to 'tools')
-rw-r--r--tools/run_tests/sources_and_headers.json19
-rw-r--r--tools/run_tests/tests.json22
2 files changed, 41 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 80242adf21..9e265713d4 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -2995,6 +2995,25 @@
"headers": [],
"is_filegroup": false,
"language": "c++",
+ "name": "round_robin_end2end_test",
+ "src": [
+ "test/cpp/end2end/round_robin_end2end_test.cc"
+ ],
+ "third_party": false,
+ "type": "target"
+ },
+ {
+ "deps": [
+ "gpr",
+ "gpr_test_util",
+ "grpc",
+ "grpc++",
+ "grpc++_test_util",
+ "grpc_test_util"
+ ],
+ "headers": [],
+ "is_filegroup": false,
+ "language": "c++",
"name": "secure_auth_context_test",
"src": [
"test/cpp/common/secure_auth_context_test.cc"
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 39daf859b4..878cba35df 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -2837,6 +2837,28 @@
"flaky": false,
"gtest": true,
"language": "c++",
+ "name": "round_robin_end2end_test",
+ "platforms": [
+ "linux",
+ "mac",
+ "posix",
+ "windows"
+ ]
+ },
+ {
+ "args": [],
+ "ci_platforms": [
+ "linux",
+ "mac",
+ "posix",
+ "windows"
+ ],
+ "cpu_cost": 1.0,
+ "exclude_configs": [],
+ "exclude_iomgrs": [],
+ "flaky": false,
+ "gtest": true,
+ "language": "c++",
"name": "secure_auth_context_test",
"platforms": [
"linux",