diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-03-25 16:14:41 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-03-25 16:14:41 -0700 |
| commit | abd7df8b1a4bbd34e494ade05b9c711f43f41eb5 (patch) | |
| tree | 8d0cdfc4115377459e66225ef36d939676149a47 | |
| parent | 690914f138d63e9bdf2478ff4e6e1e5d7a3613c3 (diff) | |
disable C# arch choosing for now
| -rwxr-xr-x | tools/run_tests/run_tests.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index aa4e3eb7ca..c292d08dc2 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -120,7 +120,12 @@ def get_c_tests(travis, test_lang) : def _check_compiler(compiler, supported_compilers): if compiler not in supported_compilers: - raise Exception('Compiler %s not supported.' % compiler) + raise Exception('Compiler %s not supported (on this platform).' % compiler) + + +def _check_arch(arch, supported_archs): + if arch not in supported_archs: + raise Exception('Architecture %s not supported.' % arch) def _is_use_docker_child(): @@ -465,6 +470,8 @@ class CSharpLanguage(object): self.config = config self.args = args if self.platform == 'windows': + # Explicitly choosing between x86 and x64 arch doesn't work yet + _check_arch(self.args.arch, ['default']) self._make_options = [_windows_toolset_option(self.args.compiler), _windows_arch_option(self.args.arch)] else: |