adjust run_*tests.py

pull/17276/head
Jan Tattermusch 6 years ago
parent 3291154db0
commit c586eea27e
  1. 2
      tools/run_tests/performance/run_worker_csharp.sh
  2. 4
      tools/run_tests/run_interop_tests.py
  3. 2
      tools/run_tests/run_tests.py

@ -18,6 +18,6 @@ set -ex
cd "$(dirname "$0")/../../.." cd "$(dirname "$0")/../../.."
# needed to correctly locate testca # needed to correctly locate testca
cd src/csharp/Grpc.IntegrationTesting.QpsWorker/bin/Release/netcoreapp1.1 cd src/csharp/Grpc.IntegrationTesting.QpsWorker/bin/Release/netcoreapp2.1
dotnet exec Grpc.IntegrationTesting.QpsWorker.dll "$@" dotnet exec Grpc.IntegrationTesting.QpsWorker.dll "$@"

@ -147,8 +147,8 @@ class CSharpLanguage:
class CSharpCoreCLRLanguage: class CSharpCoreCLRLanguage:
def __init__(self): def __init__(self):
self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.1' self.client_cwd = 'src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp2.1'
self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/netcoreapp1.1' self.server_cwd = 'src/csharp/Grpc.IntegrationTesting.Server/bin/Debug/netcoreapp2.1'
self.safename = str(self) self.safename = str(self)
def client_cmd(self, args): def client_cmd(self, args):

@ -946,7 +946,7 @@ class CSharpLanguage(object):
assembly_extension = '.exe' assembly_extension = '.exe'
if self.args.compiler == 'coreclr': if self.args.compiler == 'coreclr':
assembly_subdir += '/netcoreapp1.1' assembly_subdir += '/netcoreapp2.1'
runtime_cmd = ['dotnet', 'exec'] runtime_cmd = ['dotnet', 'exec']
assembly_extension = '.dll' assembly_extension = '.dll'
else: else:

Loading…
Cancel
Save