diff options
author | 2018-04-20 11:22:36 -0700 | |
---|---|---|
committer | 2018-04-20 11:22:36 -0700 | |
commit | fe9a6d5ec2b6f5f32b5b650acf55489db66970ac (patch) | |
tree | 3cc4adbd1b50ee8205bdd85679ea8dc1a2449141 /tools | |
parent | a1459aa6ce2a11f8d11a067cb6c86e6af84ffd71 (diff) | |
parent | f723164e3ebfd95673d03dc495ca366a2283b32d (diff) |
Merge pull request #15138 from jtattermusch/fix_csharp_macos
Fix C# macos tests
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/run_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 4146eec42d..6fb0f89381 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -921,9 +921,6 @@ class CSharpLanguage(object): if self.platform == 'mac': # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build self._make_options = ['EMBED_OPENSSL=true'] - if self.args.compiler != 'coreclr': - # On Mac, official distribution of mono is 32bit. - self._make_options += ['ARCH_FLAGS=-m32', 'LDFLAGS=-m32'] else: self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] @@ -944,6 +941,9 @@ class CSharpLanguage(object): assembly_subdir += '/net45' if self.platform == 'windows': runtime_cmd = [] + elif self.platform == 'mac': + # mono before version 5.2 on MacOS defaults to 32bit runtime + runtime_cmd = ['mono', '--arch=64'] else: runtime_cmd = ['mono'] |