address review comments

pull/10480/head
Jan Tattermusch 8 years ago
parent 3f5b8aad64
commit 78cb931afd
  1. 10
      tools/run_tests/helper_scripts/build_csharp.sh
  2. 3
      tools/run_tests/helper_scripts/pre_build_csharp.bat
  3. 2
      tools/run_tests/run_tests.py

@ -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

@ -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

@ -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'

Loading…
Cancel
Save