From d8a2fa012a9019c97b33c22e6483dc3f292d44a0 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 26 Oct 2016 16:38:46 -0700
Subject: [PATCH 1/2] Hardcode a different regex engine

---
 Makefile   | 2 +-
 build.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 721a795dae7..388d991651b 100644
--- a/Makefile
+++ b/Makefile
@@ -6751,7 +6751,7 @@ PUBLIC_HEADERS_CXX += \
 
 LIBGOOGLE_BENCHMARK_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGOOGLE_BENCHMARK_SRC))))
 
-$(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/google_benchmark/include -DHAVE_STD_REGEX
+$(LIBGOOGLE_BENCHMARK_OBJS): CPPFLAGS += -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX
 
 ifeq ($(NO_PROTOBUF),true)
 
diff --git a/build.yaml b/build.yaml
index f2021dbf93d..a872c40f208 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3588,7 +3588,7 @@ defaults:
     CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
     LDFLAGS: -g
   google_benchmark:
-    CPPFLAGS: -Ithird_party/google_benchmark/include -DHAVE_STD_REGEX
+    CPPFLAGS: -Ithird_party/google_benchmark/include -DHAVE_POSIX_REGEX
   zlib:
     CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
       $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden

From 5282cdb025d222c5bdf6069ae06ea8b568c4baf6 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 26 Oct 2016 16:40:27 -0700
Subject: [PATCH 2/2] Run benchamrks to ensure zero bitrot

---
 Makefile                   |  2 ++
 build.yaml                 |  1 -
 tools/run_tests/tests.json | 21 +++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 388d991651b..4235415606b 100644
--- a/Makefile
+++ b/Makefile
@@ -1832,6 +1832,8 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/interop_test || ( echo test interop_test failed ; exit 1 )
 	$(E) "[RUN]     Testing mock_test"
 	$(Q) $(BINDIR)/$(CONFIG)/mock_test || ( echo test mock_test failed ; exit 1 )
+	$(E) "[RUN]     Testing noop-benchmark"
+	$(Q) $(BINDIR)/$(CONFIG)/noop-benchmark || ( echo test noop-benchmark failed ; exit 1 )
 	$(E) "[RUN]     Testing proto_server_reflection_test"
 	$(Q) $(BINDIR)/$(CONFIG)/proto_server_reflection_test || ( echo test proto_server_reflection_test failed ; exit 1 )
 	$(E) "[RUN]     Testing qps_openloop_test"
diff --git a/build.yaml b/build.yaml
index a872c40f208..b261ca1ce76 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3109,7 +3109,6 @@ targets:
   - gpr
 - name: noop-benchmark
   build: test
-  run: false
   language: c++
   src:
   - test/cpp/microbenchmarks/noop-benchmark.cc
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 938aa2edde2..06cc30b0d55 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -2559,6 +2559,27 @@
       "windows"
     ]
   }, 
+  {
+    "args": [], 
+    "ci_platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ], 
+    "cpu_cost": 1.0, 
+    "exclude_configs": [], 
+    "flaky": false, 
+    "gtest": false, 
+    "language": "c++", 
+    "name": "noop-benchmark", 
+    "platforms": [
+      "linux", 
+      "mac", 
+      "posix", 
+      "windows"
+    ]
+  }, 
   {
     "args": [], 
     "ci_platforms": [