Merge pull request #367 from chen-wang/master

Remove duplicated target tips_client defintion.
pull/376/head
Yang Gao 10 years ago
commit 6293782e0d
  1. 68
      Makefile
  2. 39
      build.json
  3. 4
      tools/run_tests/tests.json

File diff suppressed because one or more lines are too long

@ -1571,7 +1571,6 @@
{ {
"name": "tips_client", "name": "tips_client",
"build": "test", "build": "test",
"run": false,
"language": "c++", "language": "c++",
"src": [ "src": [
"examples/tips/main.cc" "examples/tips/main.cc"
@ -1584,7 +1583,8 @@
"grpc", "grpc",
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
] ],
"run": false
}, },
{ {
"name": "tips_publisher_test", "name": "tips_publisher_test",
@ -1716,41 +1716,6 @@
"gpr_test_util", "gpr_test_util",
"gpr" "gpr"
] ]
},
{
"name": "tips_client",
"build": "test",
"language": "c++",
"src": [
"examples/tips/client_main.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
],
"run": false
},
{
"name": "tips_client_test",
"build": "test",
"language": "c++",
"src": [
"examples/tips/client_test.cc"
],
"deps": [
"tips_client_lib",
"grpc++_test_util",
"grpc_test_util",
"grpc++",
"grpc",
"gpr_test_util",
"gpr"
]
} }
] ]
} }

@ -289,10 +289,6 @@
"language": "c++", "language": "c++",
"name": "thread_pool_test" "name": "thread_pool_test"
}, },
{
"language": "c++",
"name": "tips_client_test"
},
{ {
"language": "c", "language": "c",
"name": "chttp2_fake_security_cancel_after_accept_test" "name": "chttp2_fake_security_cancel_after_accept_test"

Loading…
Cancel
Save