diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | build.yaml | 3 | ||||
| -rw-r--r-- | tools/run_tests/tests.json | 21 |
3 files changed, 25 insertions, 3 deletions
@@ -1835,6 +1835,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" @@ -6754,7 +6756,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 8bb1e450c8..dfba93bc47 100644 --- a/build.yaml +++ b/build.yaml @@ -3123,7 +3123,6 @@ targets: - gpr - name: noop-benchmark build: test - run: false language: c++ src: - test/cpp/microbenchmarks/noop-benchmark.cc @@ -3602,7 +3601,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 diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 938aa2edde..06cc30b0d5 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -2570,6 +2570,27 @@ "cpu_cost": 1.0, "exclude_configs": [], "flaky": false, + "gtest": false, + "language": "c++", + "name": "noop-benchmark", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "flaky": false, "gtest": true, "language": "c++", "name": "proto_server_reflection_test", |