diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-04-06 17:11:44 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-04-06 17:11:44 +0200 |
| commit | 61f729fe1a4a0c1b04f645a37f11242130bbe767 (patch) | |
| tree | 42d92aa9f75c7fd66fc87021639c3be236f727ab /tools/run_tests/helper_scripts | |
| parent | 5beff342346e4c358e5ccf39d3809b99bd60672c (diff) | |
| parent | e7369020a9b6fd0a70d09761c16d95201e04c558 (diff) | |
Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x
Diffstat (limited to 'tools/run_tests/helper_scripts')
| -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 |