diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-04-07 07:46:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 07:46:45 +0200 |
commit | 95c4e79660665027735bd0d65e4e7b02b69940c1 (patch) | |
tree | aea578c7b7ad4ddc329f87d299b73dc8e57a5164 /tools | |
parent | 1948fc5fcdb50599b1338142570ae9ad5caa5423 (diff) | |
parent | 61f729fe1a4a0c1b04f645a37f11242130bbe767 (diff) |
Merge pull request #10500 from jtattermusch/upmerge_v12x
Upmerge from upstream/v1.2.x to master
Diffstat (limited to 'tools')
-rw-r--r-- | tools/run_tests/helper_scripts/pre_build_csharp.bat | 2 | ||||
-rwxr-xr-x | tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 99df1c6626..bee430ac86 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -43,7 +43,7 @@ cd build mkdir %ARCHITECTURE% cd %ARCHITECTURE% @rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error +cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error cd ..\..\.. @rem Location of nuget.exe diff --git a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh b/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh index d7da6364d8..92d6975707 100755 --- a/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh +++ b/tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh @@ -38,4 +38,5 @@ ruby src/ruby/end2end/sig_handling_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/channel_state_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/channel_closing_driver.rb || EXIT_CODE=1 ruby src/ruby/end2end/sig_int_during_channel_watch_driver.rb || EXIT_CODE=1 +ruby src/ruby/end2end/killed_client_thread_driver.rb || EXIT_CODE=1 exit $EXIT_CODE |