diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-02-22 17:33:09 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-02-23 08:13:45 -0800 |
| commit | a2d964c24d91eb79584c0c75794d6e985d05040e (patch) | |
| tree | a4eefe5254e935f34107c716e6f8c74516348735 /tools/run_tests | |
| parent | c96caf8733ae4aa8e0e7fb3366b67e2fdb8619b1 (diff) | |
rename _WINDOWS_CONFIG
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index c6b98355cf..7ce3ed02a3 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -149,7 +149,7 @@ class CLanguage(object): if self.platform == 'windows': binary = 'vsprojects/%s%s/%s.exe' % ( 'x64/' if self.args.arch == 'x64' else '', - _WINDOWS_CONFIG[self.config.build_config], + _MSBUILD_CONFIG[self.config.build_config], target['name']) else: binary = 'bins/%s/%s' % (self.config.build_config, target['name']) @@ -402,7 +402,7 @@ class CSharpLanguage(object): assemblies = tests_json['assemblies'] tests = tests_json['tests'] - msbuild_config = _WINDOWS_CONFIG[self.config.build_config] + msbuild_config = _MSBUILD_CONFIG[self.config.build_config] assembly_files = ['%s/bin/%s/%s.dll' % (a, msbuild_config, a) for a in assemblies] @@ -568,7 +568,7 @@ _LANGUAGES = { } -_WINDOWS_CONFIG = { +_MSBUILD_CONFIG = { 'dbg': 'Debug', 'opt': 'Release', 'gcov': 'Debug', @@ -843,7 +843,7 @@ def make_jobspec(cfg, targets, makefile='Makefile'): return [ jobset.JobSpec([_windows_build_bat(args.compiler), 'vsprojects\\%s.sln' % target, - '/p:Configuration=%s' % _WINDOWS_CONFIG[cfg]] + + '/p:Configuration=%s' % _MSBUILD_CONFIG[cfg]] + extra_args + language_make_options, shell=True, timeout_seconds=None) @@ -870,7 +870,7 @@ for l in languages: def build_step_environ(cfg): environ = {'CONFIG': cfg} - msbuild_cfg = _WINDOWS_CONFIG.get(cfg) + msbuild_cfg = _MSBUILD_CONFIG.get(cfg) if msbuild_cfg: environ['MSBUILD_CONFIG'] = msbuild_cfg return environ |