Merge pull request #1612 from dgquintas/qps_type_tool_to_benchmark

Made qps_* targets "benchmark" builds.

build.json

@@ -2130,7 +2130,7 @@
     },
     {
       "name": "qps_driver",
-      "build": "tool",
+      "build": "benchmark",
       "language": "c++",
       "src": [
         "test/cpp/qps/qps_driver.cc"
@@ -2148,8 +2148,7 @@
     },
     {
       "name": "qps_test",
-      "build": "test",
+      "build": "benchmark",
-      "run": false,
       "language": "c++",
       "src": [
         "test/cpp/qps/qps_test.cc"
@@ -2161,12 +2160,13 @@
         "grpc++",
         "grpc",
         "gpr_test_util",
-        "gpr"
+        "gpr",
+        "grpc++_test_config"
       ]
     },
     {
       "name": "qps_worker",
-      "build": "tool",
+      "build": "benchmark",
       "language": "c++",
       "headers": [
         "test/cpp/qps/client.h",

templates/Makefile.template

@@ -1369,6 +1369,8 @@ $(${tgt.name.upper()}_OBJS)\
 % endif
 % if tgt.language == 'c++' and tgt.build == 'test':
  $(GTEST_LIB)\
+% elif tgt.language == 'c++' and tgt.build == 'benchmark':
+ $(GTEST_LIB)\
 % endif
  -o $(BINDIR)/$(CONFIG)/${tgt.name}
 % if tgt.build == 'protoc' or tgt.language == 'c++':