diff options
author | Sree Kuchibhotla <sreek@google.com> | 2015-11-16 14:47:59 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2015-11-16 14:47:59 -0800 |
commit | cffb1c220b004029374c1789782e48c03d7ba739 (patch) | |
tree | 53a79e537fbdb1fa9887db2681124f2c4b461456 /vsprojects | |
parent | b047c0fc9b455e6cbfd1d6b080e9bb427282b670 (diff) | |
parent | 118c0a0eec5cedfb4d610483c3e26dacf71bcd4a (diff) |
Merge branch 'master' into stress_tests_metrics
Diffstat (limited to 'vsprojects')
-rw-r--r-- | vsprojects/vcxproj/qps/qps.vcxproj | 40 | ||||
-rw-r--r-- | vsprojects/vcxproj/qps/qps.vcxproj.filters | 17 |
2 files changed, 52 insertions, 5 deletions
diff --git a/vsprojects/vcxproj/qps/qps.vcxproj b/vsprojects/vcxproj/qps/qps.vcxproj index b361b1b601..9c5a4da008 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj +++ b/vsprojects/vcxproj/qps/qps.vcxproj @@ -147,13 +147,45 @@ <ClInclude Include="..\..\..\test\cpp\util\benchmark_config.h" /> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\..\test\proto\qpstest.pb.cc"> + <ClCompile Include="..\..\..\test\proto\messages.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\test\proto\qpstest.pb.h"> + <ClInclude Include="..\..\..\test\proto\messages.pb.h"> </ClInclude> - <ClCompile Include="..\..\..\test\proto\qpstest.grpc.pb.cc"> + <ClCompile Include="..\..\..\test\proto\messages.grpc.pb.cc"> </ClCompile> - <ClInclude Include="..\..\..\test\proto\qpstest.grpc.pb.h"> + <ClInclude Include="..\..\..\test\proto\messages.grpc.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\control.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\control.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\control.grpc.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\control.grpc.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\payloads.grpc.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\services.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\services.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\services.grpc.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\services.grpc.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\stats.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\stats.pb.h"> + </ClInclude> + <ClCompile Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.cc"> + </ClCompile> + <ClInclude Include="..\..\..\test\proto\benchmarks\stats.grpc.pb.h"> </ClInclude> <ClCompile Include="..\..\..\test\cpp\qps\perf_db.pb.cc"> </ClCompile> diff --git a/vsprojects/vcxproj/qps/qps.vcxproj.filters b/vsprojects/vcxproj/qps/qps.vcxproj.filters index cffb5ff118..afa7195316 100644 --- a/vsprojects/vcxproj/qps/qps.vcxproj.filters +++ b/vsprojects/vcxproj/qps/qps.vcxproj.filters @@ -1,9 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="..\..\..\test\proto\qpstest.proto"> + <ClCompile Include="..\..\..\test\proto\messages.proto"> <Filter>test\proto</Filter> </ClCompile> + <ClCompile Include="..\..\..\test\proto\benchmarks\control.proto"> + <Filter>test\proto\benchmarks</Filter> + </ClCompile> + <ClCompile Include="..\..\..\test\proto\benchmarks\payloads.proto"> + <Filter>test\proto\benchmarks</Filter> + </ClCompile> + <ClCompile Include="..\..\..\test\proto\benchmarks\services.proto"> + <Filter>test\proto\benchmarks</Filter> + </ClCompile> + <ClCompile Include="..\..\..\test\proto\benchmarks\stats.proto"> + <Filter>test\proto\benchmarks</Filter> + </ClCompile> <ClCompile Include="..\..\..\test\cpp\qps\perf_db.proto"> <Filter>test\cpp\qps</Filter> </ClCompile> @@ -90,6 +102,9 @@ <Filter Include="test\proto"> <UniqueIdentifier>{44e63a33-67f4-0575-e87a-711a7c9111e2}</UniqueIdentifier> </Filter> + <Filter Include="test\proto\benchmarks"> + <UniqueIdentifier>{4180a094-39b4-e46c-1576-940bfe87d284}</UniqueIdentifier> + </Filter> </ItemGroup> </Project> |