diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-07-05 15:32:43 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-07-05 15:32:43 -0700 |
| commit | b633a86e1a39c9d3bb74a226a6174b88683ca372 (patch) | |
| tree | c5be96d3cc2f54648b0fa9b212b1c392d04ef73b /vsprojects | |
| parent | ad9dd52e595e877d2ddfd29a50a32765e9865422 (diff) | |
| parent | 0c009ba2b590618fdeade42bb7ebd3034f6fd045 (diff) | |
Merge branch 'master' into fix_alarm
Diffstat (limited to 'vsprojects')
4 files changed, 10 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj index 8581f0cb37..4d02c88082 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj @@ -169,6 +169,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_invoke.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_round_trip.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_before_invoke.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_in_a_vacuum.c"> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters index ae2937b1b9..89316bc535 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters @@ -28,6 +28,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_invoke.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_round_trip.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_before_invoke.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj index 1bd09989e8..9573111452 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj @@ -171,6 +171,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_invoke.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_round_trip.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_before_invoke.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_in_a_vacuum.c"> diff --git a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters index 217c60ee05..7d02fc3fa0 100644 --- a/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters +++ b/vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters @@ -31,6 +31,9 @@ <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_invoke.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_after_round_trip.c"> + <Filter>test\core\end2end\tests</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\cancel_before_invoke.c"> <Filter>test\core\end2end\tests</Filter> </ClCompile> |