aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nnoble@google.com>2015-05-11 17:40:26 -0700
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-05-12 23:24:15 +0200
commite1445368526e047d1f50a81c0194c1ca902b4d70 (patch)
tree5e0c33057f7b0feeda8537deca01bfd219d4512b /tools/run_tests
parent903810191e19ef0d2bb593815b0b5277b3eb5487 (diff)
Various Win32 fixes and improvements.
-) Properly setting up the endpoint pair. -) Beancounting on socket shutdown to properly add references. -) Only proceed to clear out data when called from the IOCP thread. -) Enabling ALL the tests. -) Fixing run_tests.py to properly invoke them.
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/run_tests.py8
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]