try making C# tests work on coreclr on mac

pull/6104/head
Jan Tattermusch 9 years ago
parent 381e26a21e
commit 6d082203eb
  1. 10
      tools/run_tests/run_tests.py

@ -509,10 +509,11 @@ class CSharpLanguage(object):
self._docker_distro = 'coreclr'
if self.platform == 'mac':
# On Mac, official distribution of mono is 32bit.
# TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build
self._make_options = ['EMBED_OPENSSL=true',
'CFLAGS=-m32', 'LDFLAGS=-m32']
self._make_options = ['EMBED_OPENSSL=true']
if self.args.compiler != 'coreclr':
# On Mac, official distribution of mono is 32bit.
self._make_options += ['CFLAGS=-m32', 'LDFLAGS=-m32']
else:
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
@ -529,6 +530,9 @@ class CSharpLanguage(object):
if self.platform == 'linux':
assembly_subdir += '/netstandard1.5/debian.8-x64'
assembly_extension = ''
if self.platform == 'mac':
assembly_subdir += '/netstandard1.5/osx.10.11-x64'
assembly_extension = ''
else:
assembly_subdir += '/netstandard1.5/win7-x64'
runtime_cmd = []

Loading…
Cancel
Save