Complete microbenchmarks

5 files changed, 18 insertions, 4 deletions

diff --git a/.clang_complete b/.clang_complete
index 79d0946b33..e35f74198f 100644
--- a/.clang_complete
+++ b/.clang_complete
@@ -4,5 +4,6 @@
 -Igens
 -I.
 -Ithird_party/boringssl/include
+-Ithird_party/benchmark/include
 -Ithird_party/zlib
 -Ithird_party/protobuf/src
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index 5c90f1db44..9c02bc50f8 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -57,9 +57,11 @@ cc_library(
         "reconnect_server.c",
         "slice_splitter.c",
         "test_tcp_server.c",
+        "trickle_endpoint.c",
     ],
     hdrs = [
         "debugger_macros.h",
+        "trickle_endpoint.h",
         "grpc_profiler.h",
         "mock_endpoint.h",
         "parse_hexstring.h",
diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index 0efa88c9ab..b391f8766f 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -32,5 +32,17 @@ licenses(["notice"])  # 3-clause BSD
 cc_test(
     name = "noop-benchmark",
     srcs = ["noop-benchmark.cc"],
-    deps = ["//:grpc++", "//external:benchmark"],
+    deps = ["//external:benchmark"],
+)
+
+cc_test(
+    name = "bm_fullstack",
+    srcs = ["bm_fullstack.cc"],
+    deps = ["//:grpc++", "//external:benchmark", "//test/core/util:grpc_test_util", "//src/proto/grpc/testing:echo_proto"],
+)
+
+cc_test(
+    name = "bm_closure",
+    srcs = ["bm_closure.cc"],
+    deps = ["//:grpc", "//external:benchmark"],
 )
diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc
index 80d6610e13..586221945a 100644
--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@@ -33,6 +33,7 @@
 
 /* Test various closure related operations */
 
+#include <benchmark/benchmark.h>
 #include <grpc/grpc.h>
 
 extern "C" {
@@ -41,8 +42,6 @@ extern "C" {
 #include "src/core/lib/iomgr/exec_ctx.h"
 }
 
-#include "third_party/benchmark/include/benchmark/benchmark.h"
-
 static class InitializeStuff {
  public:
   InitializeStuff() { grpc_init(); }
diff --git a/test/cpp/microbenchmarks/bm_fullstack.cc b/test/cpp/microbenchmarks/bm_fullstack.cc
index c63de0ce0a..28ce170efa 100644
--- a/test/cpp/microbenchmarks/bm_fullstack.cc
+++ b/test/cpp/microbenchmarks/bm_fullstack.cc
@@ -35,6 +35,7 @@
 
 #include <sstream>
 
+#include <benchmark/benchmark.h>
 #include <grpc++/channel.h>
 #include <grpc++/create_channel.h>
 #include <grpc++/impl/grpc_library.h>
@@ -63,7 +64,6 @@ extern "C" {
 #include "src/core/lib/profiling/timers.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
-#include "third_party/benchmark/include/benchmark/benchmark.h"
 
 namespace grpc {
 namespace testing {