Merge pull request #1563 from nicolasnoble/more-win32-fixes

Various Win32 fixes and improvements.

1 files changed, 6 insertions, 2 deletions

diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 50fdec7f5f..4ba92a813e 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -107,6 +107,7 @@ class CLanguage(object):
       plat = 'windows'
     else:
       plat = 'posix'
+    self.platform = plat
     with open('tools/run_tests/tests.json') as f:
       js = json.load(f)
       self.binaries = [tgt
@@ -119,9 +120,12 @@ class CLanguage(object):
     for target in self.binaries:
       if travis and target['flaky']:
         continue
-      binary = 'bins/%s/%s' % (config.build_config, target['name'])
+      if self.platform == 'windows':
+        binary = 'vsprojects\\test_bin\\%s.exe' % (target['name'])
+      else:
+        binary = 'bins/%s/%s' % (config.build_config, target['name'])
       out.append(config.job_spec([binary], [binary]))
-    return out
+    return sorted(out)
 
   def make_targets(self):
     return ['buildtests_%s' % self.make_target]