From 64c137c4f5e23e898d5fbc6306b191daaf147ec0 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 20 Jun 2016 17:54:19 -0700
Subject: [PATCH] select runtime dir
---
tools/run_tests/run_tests.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 3cb0be579d..c5cf0135f7 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -526,10 +526,11 @@ class CSharpLanguage(object):
assembly_extension = '.exe'
if self.args.compiler == 'coreclr':
- # TODO(jtattermusch): make the runtime string platform-specific
- #assembly_subdir += '/netstandard1.5/debian.8-x64'
- #assembly_extension = ''
- assembly_subdir += '/netstandard1.5/win7-x64'
+ if self.platform == 'linux':
+ assembly_subdir += '/netstandard1.5/debian.8-x64'
+ assembly_extension = ''
+ else:
+ assembly_subdir += '/netstandard1.5/win7-x64'
runtime_cmd = []
else:
nunit_args += ['--noresult', '--workers=1']
--
GitLab