diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-10-05 17:52:44 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-10-05 17:52:44 +0200 |
| commit | ce656957ea897a720e1c2393d182799b24f705d9 (patch) | |
| tree | 529c1a8b6a7b112e5372f68aa6af98b63c162a47 | |
| parent | b4b24dc13d8300ea50fdaa828c1bafb8b9338717 (diff) | |
address review comments
| -rwxr-xr-x | tools/run_tests/artifacts/build_artifact_csharp.sh | 9 | ||||
| -rwxr-xr-x | tools/run_tests/helper_scripts/pre_build_csharp.sh | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/tools/run_tests/artifacts/build_artifact_csharp.sh b/tools/run_tests/artifacts/build_artifact_csharp.sh index f6630a709c..bb8a91b520 100755 --- a/tools/run_tests/artifacts/build_artifact_csharp.sh +++ b/tools/run_tests/artifacts/build_artifact_csharp.sh @@ -20,8 +20,13 @@ cd "$(dirname "$0")/../../.." mkdir -p cmake/build cd cmake/build -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DgRPC_BACKWARDS_COMPATIBILITY_MODE=ON -DgRPC_BUILD_TESTS=OFF "${CMAKE_ARCH_OPTION}" ../.. -make grpc_csharp_ext +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DgRPC_BACKWARDS_COMPATIBILITY_MODE=ON \ + -DgRPC_BUILD_TESTS=OFF \ + "${CMAKE_ARCH_OPTION}" \ + ../.. + +make grpc_csharp_ext -j2 cd ../.. mkdir -p "${ARTIFACTS_OUT}" diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.sh b/tools/run_tests/helper_scripts/pre_build_csharp.sh index 9f98c440a7..7d83986f90 100755 --- a/tools/run_tests/helper_scripts/pre_build_csharp.sh +++ b/tools/run_tests/helper_scripts/pre_build_csharp.sh @@ -15,7 +15,7 @@ set -ex -# cd to gRPC csharp directory +# cd to repository root cd "$(dirname "$0")/../../.." mkdir -p cmake/build diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index c6668d3efe..c9b4c8b28b 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1021,6 +1021,8 @@ class CSharpLanguage(object): if self.platform == 'windows': return 'cmake/build/%s/Makefile' % self._cmake_arch_option else: + # no need to set x86 specific flags as run_tests.py + # currently forbids x86 C# builds on both Linux and MacOS. return 'cmake/build/Makefile' def dockerfile_dir(self): |