diff --git a/Makefile b/Makefile index f75d4565e757da04592011edfda0a529acea3f9c..7863857667bd3c1a8775fe5140e2d33350191099 100644 --- a/Makefile +++ b/Makefile @@ -1795,6 +1795,8 @@ test_cxx: buildtests_cxx $(Q) $(BINDIR)/$(CONFIG)/async_end2end_test || ( echo test async_end2end_test failed ; exit 1 ) $(E) "[RUN] Testing auth_property_iterator_test" $(Q) $(BINDIR)/$(CONFIG)/auth_property_iterator_test || ( echo test auth_property_iterator_test failed ; exit 1 ) + $(E) "[RUN] Testing bm_fullstack" + $(Q) $(BINDIR)/$(CONFIG)/bm_fullstack || ( echo test bm_fullstack failed ; exit 1 ) $(E) "[RUN] Testing channel_arguments_test" $(Q) $(BINDIR)/$(CONFIG)/channel_arguments_test || ( echo test channel_arguments_test failed ; exit 1 ) $(E) "[RUN] Testing cli_call_test" @@ -6738,19 +6740,19 @@ endif LIBGOOGLE_BENCHMARK_SRC = \ - third_party/google_benchmark/src/benchmark.cc \ third_party/google_benchmark/src/benchmark_register.cc \ - third_party/google_benchmark/src/colorprint.cc \ - third_party/google_benchmark/src/commandlineflags.cc \ - third_party/google_benchmark/src/complexity.cc \ - third_party/google_benchmark/src/console_reporter.cc \ - third_party/google_benchmark/src/csv_reporter.cc \ third_party/google_benchmark/src/json_reporter.cc \ + third_party/google_benchmark/src/string_util.cc \ + third_party/google_benchmark/src/console_reporter.cc \ third_party/google_benchmark/src/reporter.cc \ + third_party/google_benchmark/src/timers.cc \ + third_party/google_benchmark/src/commandlineflags.cc \ + third_party/google_benchmark/src/csv_reporter.cc \ + third_party/google_benchmark/src/complexity.cc \ + third_party/google_benchmark/src/benchmark.cc \ + third_party/google_benchmark/src/colorprint.cc \ third_party/google_benchmark/src/sleep.cc \ - third_party/google_benchmark/src/string_util.cc \ third_party/google_benchmark/src/sysinfo.cc \ - third_party/google_benchmark/src/timers.cc \ PUBLIC_HEADERS_CXX += \ diff --git a/build.yaml b/build.yaml index dfba93bc47edf4dfdd92c7ebbce254c082dc6b17..6277f7fbfd476e1b704496dc29b92f2347bc84dd 100644 --- a/build.yaml +++ b/build.yaml @@ -2680,7 +2680,6 @@ targets: - gpr - name: bm_fullstack build: test - run: false language: c++ src: - test/cpp/microbenchmarks/bm_fullstack.cc diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 06cc30b0d5536ecde1bc3bb1adec8edbbd71e36a..71d6017a8b9df888b166d7f3828367b90e071e6b 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -2143,6 +2143,27 @@ "windows" ] }, + { + "args": [], + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "flaky": false, + "gtest": false, + "language": "c++", + "name": "bm_fullstack", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ] + }, { "args": [], "ci_platforms": [ diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj index b0c8d07b236457212e1f7953a289a74efdbd9507..5de36255a25d632c536b58b2f8d2e5c9b5ec1460 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj @@ -147,54 +147,54 @@ </ItemDefinitionGroup> <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" /> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h" /> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" /> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc"> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc"> - </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc"> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc"> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc"> - </ClCompile> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters index 6768675b3cbac08ca580e756d79107879d6cb1d7..e278573ee86ddd78502e236dec37b8efae34b4eb 100644 --- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters +++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters @@ -1,94 +1,97 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc"> + <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc"> <Filter>third_party\google_benchmark\src</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h"> + <Filter>third_party\google_benchmark\src</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h"> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h"> <Filter>third_party\google_benchmark\src</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h"> - <Filter>third_party\google_benchmark\src</Filter> + <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h"> + <Filter>third_party\google_benchmark\include\benchmark</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h"> <Filter>third_party\google_benchmark\include\benchmark</Filter> @@ -96,9 +99,6 @@ <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h"> <Filter>third_party\google_benchmark\include\benchmark</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h"> - <Filter>third_party\google_benchmark\include\benchmark</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h"> <Filter>third_party\google_benchmark\include\benchmark</Filter> </ClInclude>