diff options
| author |  Michael Lumish <mlumish@google.com> | 2016-01-19 09:18:42 -0800 |
|---|---|---|
| committer | Michael Lumish <mlumish@google.com> | 2016-01-19 09:18:42 -0800 |
| commit | 2bd2b3e4269106012e0d423d0e2abc9cfca3b406 (patch) | |
| tree | 00c63b7b5bdcd02bd8b44dce3674d981b2ce02ce /tools | |
| parent | d70b6dc761746015fc0dc70662dadd4bda533c7e (diff) | |
| parent | 447ef7eaaac24bf236fff90c007e5b27b120b785 (diff) | |
Merge pull request #4730 from jtattermusch/revamp_native_loader
Revamp C# native loader
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/grpc_interop_csharp/build_interop.sh | 4 | ||||
| -rwxr-xr-x | tools/run_tests/build_csharp.sh | 5 | ||||
| -rwxr-xr-x | tools/run_tests/run_csharp.sh | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/tools/jenkins/grpc_interop_csharp/build_interop.sh b/tools/jenkins/grpc_interop_csharp/build_interop.sh index 8fde687900..e87fe2f692 100755 --- a/tools/jenkins/grpc_interop_csharp/build_interop.sh +++ b/tools/jenkins/grpc_interop_csharp/build_interop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,6 +42,6 @@ cd /var/local/git/grpc make install-certs # build C# interop client & server -make install_grpc_csharp_ext +make CONFIG=dbg grpc_csharp_ext (cd src/csharp && mono /var/local/NuGet.exe restore Grpc.sln) (cd src/csharp && xbuild Grpc.sln) diff --git a/tools/run_tests/build_csharp.sh b/tools/run_tests/build_csharp.sh index 55643ff924..aadd11e205 100755 --- a/tools/run_tests/build_csharp.sh +++ b/tools/run_tests/build_csharp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -32,4 +32,5 @@ set -ex cd $(dirname $0)/../../src/csharp -xbuild /p:Configuration=$MSBUILD_CONFIG Grpc.sln +# overriding NativeDependenciesConfigurationUnix is needed to make gcov code coverage work. +xbuild /p:Configuration=$MSBUILD_CONFIG /p:NativeDependenciesConfigurationUnix=$CONFIG Grpc.sln diff --git a/tools/run_tests/run_csharp.sh b/tools/run_tests/run_csharp.sh index 744df07e1c..10f1c28521 100755 --- a/tools/run_tests/run_csharp.sh +++ b/tools/run_tests/run_csharp.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -36,9 +36,6 @@ NUNIT_CONSOLE="mono packages/NUnit.Runners.2.6.4/tools/nunit-console.exe" # change to gRPC repo root cd $(dirname $0)/../.. -# path needs to be absolute -export LD_LIBRARY_PATH=$(pwd)/libs/$CONFIG - (cd src/csharp; $NUNIT_CONSOLE $@) if [ "$CONFIG" = "gcov" ] |