aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Michael Lumish <mlumish@google.com>2016-01-28 14:58:53 -0800
committerGravatar Michael Lumish <mlumish@google.com>2016-01-28 14:58:53 -0800
commit822602cff0f3b1f8373ac06a8ab8fe9792b1037e (patch)
tree78cbdf26fedecb44d1f1ee00410ad3d2a4c8ccb8
parent1602034114f1a56fec9f4fb968e873e1143cafb2 (diff)
parent3de6b76942030cda864f1cddc252d935c9946b29 (diff)
Merge pull request #4947 from jtattermusch/win64_correct_test_path
Use correct path for C tests on Win 64
-rwxr-xr-xtools/run_tests/run_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index fbc74014e9..9e7b97c6a2 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -132,8 +132,10 @@ class CLanguage(object):
if config.build_config in target['exclude_configs']:
continue
if self.platform == 'windows':
- binary = 'vsprojects/%s/%s.exe' % (
- _WINDOWS_CONFIG[config.build_config], target['name'])
+ binary = 'vsprojects/%s%s/%s.exe' % (
+ 'x64/' if args.arch == 'x64' else '',
+ _WINDOWS_CONFIG[config.build_config],
+ target['name'])
else:
binary = 'bins/%s/%s' % (config.build_config, target['name'])
if os.path.isfile(binary):