Index: tools/isolate/fix_test_cases.py |
diff --git a/tools/isolate/fix_test_cases.py b/tools/isolate/fix_test_cases.py |
index 057765ad8695cf97a0bc443c3cdd69ed2b23ed28..ca456ee08cc2ab4bbf3d127fb8a58ed53970eb4f 100755 |
--- a/tools/isolate/fix_test_cases.py |
+++ b/tools/isolate/fix_test_cases.py |
@@ -62,13 +62,10 @@ def run_all(result, shard_index, shard_count): |
env['GTEST_SHARD_INDEX'] = str(shard_index) |
env['GTEST_TOTAL_SHARDS'] = str(shard_count) |
cmd = [sys.executable, 'isolate.py', 'run', '-r', result] |
- return_code = subprocess.call(cmd, env=env) |
+ subprocess.call(cmd, env=env) |
if not os.path.isfile(result_file): |
print >> sys.stderr, 'Failed to find %s' % result_file |
return None |
- if return_code: |
- print >> sys.stderr, 'Failed to run isolate.py run' |
- return None |
with open(result_file) as f: |
try: |
data = json.load(f) |
@@ -174,7 +171,10 @@ def main(): |
parser.error('Use with the name of the test only, e.g. "unit_tests"') |
basename = args[0] |
- executable = '../../out/Release/%s' % basename |
+ if sys.platform == 'win32' or sys.platform == 'cygwin': |
M-A Ruel
2012/08/27 14:21:51
if sys.platform in ('cygwin', 'win32'):
csharp
2012/08/27 15:52:41
Done.
|
+ executable = '../../build/Release/%s' % basename |
M-A Ruel
2012/08/27 14:21:51
Actually, that's kind of crappy, I'd rather remove
csharp
2012/08/27 15:52:41
Done.
|
+ else: |
+ executable = '../../out/Release/%s' % basename |
result = '%s.results' % executable |
if sys.platform == 'win32': |
M-A Ruel
2012/08/27 15:31:09
cygwin too. But I don't think tracing works.
csharp
2012/08/27 15:52:41
Done.
|
executable += '.exe' |