Merge branch 'hybrid' of github.com:ctiller/grpc into hybrid

2 files changed, 81 insertions, 51 deletions

diff --git a/build.yaml b/build.yaml
index afac7a6041..58a474aabf 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3128,7 +3128,7 @@ targets:
   - linux
   - posix
 - name: alarm_cpp_test
-  cpu_cost: 0.1
+  gtest: true
   build: test
   language: c++
   src:
@@ -3141,7 +3141,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: async_end2end_test
-  cpu_cost: 0.8
+  gtest: true
   build: test
   language: c++
   src:
@@ -3154,6 +3154,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: auth_property_iterator_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3455,7 +3456,6 @@ targets:
   - linux
   - posix
 - name: bm_pollset
-  cpu_cost: 0.5
   build: test
   language: c++
   src:
@@ -3477,6 +3477,7 @@ targets:
   - linux
   - posix
 - name: channel_arguments_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3486,6 +3487,7 @@ targets:
   - grpc
   - gpr
 - name: channel_filter_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3495,6 +3497,7 @@ targets:
   - grpc
   - gpr
 - name: cli_call_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3508,6 +3511,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: client_crash_test
+  gtest: true
   cpu_cost: 0.1
   build: test
   language: c++
@@ -3538,6 +3542,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: codegen_test_full
+  gtest: true
   build: test
   language: c++
   src:
@@ -3554,6 +3559,7 @@ targets:
   filegroups:
   - grpc++_codegen_base
 - name: codegen_test_minimal
+  gtest: true
   build: test
   language: c++
   src:
@@ -3570,6 +3576,7 @@ targets:
   - grpc++_codegen_base
   - grpc++_codegen_base_src
 - name: credentials_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3579,6 +3586,7 @@ targets:
   - grpc
   - gpr
 - name: cxx_byte_buffer_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3590,6 +3598,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: cxx_slice_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3601,6 +3610,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: cxx_string_ref_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3608,6 +3618,7 @@ targets:
   deps:
   - grpc++
 - name: cxx_time_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3619,7 +3630,8 @@ targets:
   - gpr_test_util
   - gpr
 - name: end2end_test
-  cpu_cost: 1.0
+  gtest: true
+  cpu_cost: 0.5
   build: test
   language: c++
   src:
@@ -3632,6 +3644,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: error_details_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3641,6 +3654,7 @@ targets:
   - grpc++_error_details
   - grpc++
 - name: filter_end2end_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3653,7 +3667,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: generic_end2end_test
-  cpu_cost: 0.1
+  gtest: true
   build: test
   language: c++
   src:
@@ -3666,6 +3680,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: golden_file_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3759,7 +3774,7 @@ targets:
   vs_config_type: Application
   vs_project_guid: '{069E9D05-B78B-4751-9252-D21EBAE7DE8E}'
 - name: grpc_tool_test
-  cpu_cost: 0.2
+  gtest: true
   build: test
   language: c++
   src:
@@ -3779,6 +3794,7 @@ targets:
   filegroups:
   - grpc++_codegen_proto
 - name: grpclb_api_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3790,7 +3806,7 @@ targets:
   - grpc++
   - grpc
 - name: grpclb_test
-  cpu_cost: 0.1
+  gtest: false
   build: test
   language: c++
   src:
@@ -3804,6 +3820,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: health_service_end2end_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3932,6 +3949,7 @@ targets:
   - gpr
   - grpc++_test_config
 - name: mock_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3952,6 +3970,7 @@ targets:
   - benchmark
   defaults: benchmark
 - name: proto_server_reflection_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -3966,6 +3985,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: proto_utils_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4083,6 +4103,7 @@ targets:
   - gpr
   - grpc++_test_config
 - name: round_robin_end2end_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4095,6 +4116,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: secure_auth_context_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4124,6 +4146,7 @@ targets:
   - linux
   - posix
 - name: server_builder_plugin_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4136,6 +4159,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: server_builder_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4150,6 +4174,7 @@ targets:
   - grpc
   - gpr
 - name: server_context_test_spouse_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4163,6 +4188,7 @@ targets:
   uses:
   - grpc++_test
 - name: server_crash_test
+  gtest: true
   cpu_cost: 0.1
   build: test
   language: c++
@@ -4193,6 +4219,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: shutdown_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4216,6 +4243,7 @@ targets:
   - gpr_test_util
   - gpr
 - name: streaming_throughput_test
+  gtest: true
   build: test
   language: c++
   src:
@@ -4269,6 +4297,7 @@ targets:
   - gpr
   - grpc++_test_config
 - name: thread_stress_test
+  gtest: true
   cpu_cost: 100
   build: test
   language: c++
@@ -4282,7 +4311,8 @@ targets:
   - gpr_test_util
   - gpr
 - name: writes_per_rpc_test
-  cpu_cost: 0.8
+  gtest: true
+  cpu_cost: 0.5
   build: test
   language: c++
   src:
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 96f4af6042..203f51b6b8 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -2613,11 +2613,11 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.1, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "alarm_cpp_test", 
     "platforms": [
@@ -2635,11 +2635,11 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "async_end2end_test", 
     "platforms": [
@@ -2661,7 +2661,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "auth_property_iterator_test", 
     "platforms": [
@@ -2986,7 +2986,7 @@
       "mac", 
       "posix"
     ], 
-    "cpu_cost": 0.5, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
@@ -3011,7 +3011,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "channel_arguments_test", 
     "platforms": [
@@ -3033,7 +3033,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "channel_filter_test", 
     "platforms": [
@@ -3055,7 +3055,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "cli_call_test", 
     "platforms": [
@@ -3076,7 +3076,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "client_crash_test", 
     "platforms": [
@@ -3097,7 +3097,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "codegen_test_full", 
     "platforms": [
@@ -3119,7 +3119,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "codegen_test_minimal", 
     "platforms": [
@@ -3141,7 +3141,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "credentials_test", 
     "platforms": [
@@ -3163,7 +3163,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "cxx_byte_buffer_test", 
     "platforms": [
@@ -3185,7 +3185,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "cxx_slice_test", 
     "platforms": [
@@ -3207,7 +3207,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "cxx_string_ref_test", 
     "platforms": [
@@ -3229,7 +3229,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "cxx_time_test", 
     "platforms": [
@@ -3247,11 +3247,11 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 1.0, 
+    "cpu_cost": 0.5, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "end2end_test", 
     "platforms": [
@@ -3273,7 +3273,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "error_details_test", 
     "platforms": [
@@ -3295,7 +3295,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "filter_end2end_test", 
     "platforms": [
@@ -3313,11 +3313,11 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.1, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "generic_end2end_test", 
     "platforms": [
@@ -3341,7 +3341,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "golden_file_test", 
     "platforms": [
@@ -3359,11 +3359,11 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.2, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "grpc_tool_test", 
     "platforms": [
@@ -3385,7 +3385,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "grpclb_api_test", 
     "platforms": [
@@ -3403,7 +3403,7 @@
       "posix", 
       "windows"
     ], 
-    "cpu_cost": 0.1, 
+    "cpu_cost": 1.0, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
@@ -3429,7 +3429,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "health_service_end2end_test", 
     "platforms": [
@@ -3493,7 +3493,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "mock_test", 
     "platforms": [
@@ -3537,7 +3537,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "proto_server_reflection_test", 
     "platforms": [
@@ -3559,7 +3559,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "proto_utils_test", 
     "platforms": [
@@ -3601,7 +3601,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "round_robin_end2end_test", 
     "platforms": [
@@ -3623,7 +3623,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "secure_auth_context_test", 
     "platforms": [
@@ -3665,7 +3665,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "server_builder_plugin_test", 
     "platforms": [
@@ -3687,7 +3687,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "server_builder_test", 
     "platforms": [
@@ -3709,7 +3709,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "server_context_test_spouse_test", 
     "platforms": [
@@ -3730,7 +3730,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "server_crash_test", 
     "platforms": [
@@ -3751,7 +3751,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "shutdown_test", 
     "platforms": [
@@ -3794,7 +3794,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "streaming_throughput_test", 
     "platforms": [
@@ -3837,7 +3837,7 @@
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "thread_stress_test", 
     "platforms": [
@@ -3854,11 +3854,11 @@
       "mac", 
       "posix"
     ], 
-    "cpu_cost": 0.8, 
+    "cpu_cost": 0.5, 
     "exclude_configs": [], 
     "exclude_iomgrs": [], 
     "flaky": false, 
-    "gtest": false, 
+    "gtest": true, 
     "language": "c++", 
     "name": "writes_per_rpc_test", 
     "platforms": [