Merge pull request #17418 from grpc/revert-16882-microbenchmarks-bazel

Revert "Make Microbenchmarks Test Targets"

1 files changed, 20 insertions, 33 deletions

diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index 84ea386870..5ae9a9a791 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -46,55 +46,51 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_closure",
+    testonly = 1,
     srcs = ["bm_closure.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-# TODO(https://github.com/grpc/grpc/pull/16882): make this a test target
-# right now it OOMs
 grpc_cc_binary(
     name = "bm_arena",
     srcs = ["bm_arena.cc"],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_channel",
+    testonly = 1,
     srcs = ["bm_channel.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-# TODO(https://github.com/grpc/grpc/pull/16882): make this a test target
-# right now it fails UBSAN
 grpc_cc_binary(
     name = "bm_call_create",
     srcs = ["bm_call_create.cc"],
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_cq",
+    testonly = 1,
     srcs = ["bm_cq.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_cq_multiple_threads",
+    testonly = 1,
     srcs = ["bm_cq_multiple_threads.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_error",
+    testonly = 1,
     srcs = ["bm_error.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
 grpc_cc_library(
@@ -105,8 +101,9 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_streaming_ping_pong",
+    testonly = 1,
     srcs = [
         "bm_fullstack_streaming_ping_pong.cc",
     ],
@@ -121,8 +118,9 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_streaming_pump",
+    testonly = 1,
     srcs = [
         "bm_fullstack_streaming_pump.cc",
     ],
@@ -143,38 +141,27 @@ grpc_cc_library(
     deps = [":helpers"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_fullstack_unary_ping_pong",
+    testonly = 1,
     srcs = [
         "bm_fullstack_unary_ping_pong.cc",
     ],
     deps = [":fullstack_unary_ping_pong_h"],
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_metadata",
+    testonly = 1,
     srcs = ["bm_metadata.cc"],
     deps = [":helpers"],
-    uses_polling = False,
 )
 
-grpc_cc_test(
+grpc_cc_binary(
     name = "bm_chttp2_hpack",
+    testonly = 1,
     srcs = ["bm_chttp2_hpack.cc"],
     deps = [":helpers"],
-    uses_polling = False,
-)
-
-grpc_cc_test(
-    name = "bm_chttp2_transport",
-    srcs = ["bm_chttp2_transport.cc"],
-    deps = [":helpers"],
-)
-
-grpc_cc_test(
-    name = "bm_pollset",
-    srcs = ["bm_pollset.cc"],
-    deps = [":helpers"],
 )
 
 grpc_cc_binary(