Merge github.com:google/grpc into c++api
diff --git a/build.json b/build.json
index e6a726d..4895c79 100644
--- a/build.json
+++ b/build.json
@@ -756,6 +756,7 @@
{
"name": "echo_client",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/echo/client.c"
@@ -765,12 +766,12 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "echo_server",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/echo/server.c"
@@ -780,8 +781,7 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "echo_test",
@@ -814,6 +814,7 @@
{
"name": "fling_client",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/fling/client.c"
@@ -823,12 +824,12 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "fling_server",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/fling/server.c"
@@ -838,8 +839,7 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "fling_stream_test",
@@ -1249,6 +1249,7 @@
{
"name": "json_rewrite",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/json/json_rewrite.c"
@@ -1256,12 +1257,12 @@
"deps": [
"grpc",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "json_rewrite_test",
"build": "test",
+ "run": false,
"language": "c",
"src": [
"test/core/json/json_rewrite_test.c"
@@ -1271,8 +1272,7 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "json_test",
@@ -1584,6 +1584,7 @@
{
"name": "interop_client",
"build": "test",
+ "run": false,
"language": "c++",
"src": [
"test/cpp/interop/empty.proto",
@@ -1598,12 +1599,12 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "interop_server",
"build": "test",
+ "run": false,
"language": "c++",
"src": [
"test/cpp/interop/empty.proto",
@@ -1618,8 +1619,7 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "qps_client",
@@ -1707,6 +1707,7 @@
{
"name": "tips_client",
"build": "test",
+ "run": false,
"language": "c++",
"src": [
"examples/tips/main.cc"
@@ -1719,8 +1720,7 @@
"grpc",
"gpr_test_util",
"gpr"
- ],
- "run": false
+ ]
},
{
"name": "tips_publisher_test",
diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py
index 4992beb..6477ad2 100755
--- a/tools/buildgen/build-cleaner.py
+++ b/tools/buildgen/build-cleaner.py
@@ -13,6 +13,7 @@
_ELEM_KEYS = [
'name',
'build',
+ 'run',
'language',
'public_headers',
'headers',