From 78cb931afd9bf4ae33ecaf26dbd498cff41d6b52 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 11 Apr 2017 11:04:42 +0200
Subject: [PATCH] address review comments
---
tools/run_tests/helper_scripts/build_csharp.sh | 10 ++++------
tools/run_tests/helper_scripts/pre_build_csharp.bat | 3 +--
tools/run_tests/run_tests.py | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/tools/run_tests/helper_scripts/build_csharp.sh b/tools/run_tests/helper_scripts/build_csharp.sh
index 00897ecbe6..a7562a7f4a 100755
--- a/tools/run_tests/helper_scripts/build_csharp.sh
+++ b/tools/run_tests/helper_scripts/build_csharp.sh
@@ -32,12 +32,10 @@ set -ex
cd $(dirname $0)/../../../src/csharp
-OVERRIDE_NATIVELIB_MAYBE=""
if [ "$CONFIG" == "gcov" ]
then
- # overriding NativeDependenciesConfigurationUnix makes C# project pick up
- # the gcov flavor of grpc_csharp_ext
- OVERRIDE_NATIVELIB_MAYBE="/p:NativeDependenciesConfigurationUnix=$CONFIG"
+ # overriding NativeDependenciesConfigurationUnix makes C# project pick up the gcov flavor of grpc_csharp_ext
+ dotnet build --configuration $MSBUILD_CONFIG /p:NativeDependenciesConfigurationUnix=gcov Grpc.sln
+else
+ dotnet build --configuration $MSBUILD_CONFIG Grpc.sln
fi
-
-dotnet build --configuration $MSBUILD_CONFIG $OVERRIDE_NATIVELIB_MAYBE Grpc.sln
diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat
index c7684f538e..e59dac4edc 100644
--- a/tools/run_tests/helper_scripts/pre_build_csharp.bat
+++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat
@@ -44,9 +44,8 @@ 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 -DgRPC_MSVC_STATIC_RUNTIME=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error
-cd ..\..\..
-cd src/csharp
+cd ..\..\..\src\csharp
dotnet restore Grpc.sln || goto :error
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 9fa7cca14e..23abda376b 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -763,7 +763,7 @@ class CSharpLanguage(object):
tests_by_assembly = json.load(f)
msbuild_config = _MSBUILD_CONFIG[self.config.build_config]
- nunit_args = ['--labels=All','--noresult', '--workers=1']
+ nunit_args = ['--labels=All', '--noresult', '--workers=1']
assembly_subdir = 'bin/%s' % msbuild_config
assembly_extension = '.exe'
--
GitLab