| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 | 2 |
| 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 """Dart frog buildbot steps | 7 """Dart frog buildbot steps |
| 8 | 8 |
| 9 Runs tests for the frog compiler (running on the vm or the self-hosting version) | 9 Runs tests for the frog compiler (running on the vm or the self-hosting version) |
| 10 """ | 10 """ |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 | 43 |
| 44 | 44 |
| 45 def TestStep(name, mode, system, component, targets, flags): | 45 def TestStep(name, mode, system, component, targets, flags): |
| 46 print '@@@BUILD_STEP %s tests: %s %s@@@' % (name, component, flags) | 46 print '@@@BUILD_STEP %s tests: %s %s@@@' % (name, component, flags) |
| 47 sys.stdout.flush() | 47 sys.stdout.flush() |
| 48 if (component == 'frogium' or component == 'webdriver') and system == 'linux': | 48 if (component == 'frogium' or component == 'webdriver') and system == 'linux': |
| 49 cmd = ['xvfb-run', '-a'] | 49 cmd = ['xvfb-run', '-a'] |
| 50 else: | 50 else: |
| 51 cmd = [] | 51 cmd = [] |
| 52 | 52 |
| 53 num_tasks = 8 | |
| 54 if system == 'windows': | |
| 55 # TODO(efortuna): This is a temporary measure because webdriver isn't | |
| 56 # threadsafe(!), and the results seem to be most obvious/problematic on | |
| 57 # Windows. | |
| 58 num_tasks = 1 | |
| 59 | |
| 60 cmd = (cmd | 53 cmd = (cmd |
| 61 + [sys.executable, | 54 + [sys.executable, |
| 62 os.path.join('..', 'tools', 'test_wrapper.py'), | 55 os.path.join('..', 'tools', 'test_wrapper.py'), |
| 63 '--mode=' + mode, | 56 '--mode=' + mode, |
| 64 '--component=' + component, | 57 '--component=' + component, |
| 65 '--time', | 58 '--time', |
| 66 '--report', | 59 '--report', |
| 67 '-j%d' % num_tasks, | |
| 68 '--progress=buildbot', | 60 '--progress=buildbot', |
| 69 '-v'] | 61 '-v'] |
| 70 + targets) | 62 + targets) |
| 71 if flags: | 63 if flags: |
| 72 cmd.extend(flags) | 64 cmd.extend(flags) |
| 73 | 65 |
| 74 exit_code = subprocess.call(cmd, env=NO_COLOR_ENV) | 66 exit_code = subprocess.call(cmd, env=NO_COLOR_ENV) |
| 75 if exit_code != 0: | 67 if exit_code != 0: |
| 76 print '@@@STEP_FAILURE@@@' | 68 print '@@@STEP_FAILURE@@@' |
| 77 return exit_code | 69 return exit_code |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 165 |
| 174 status = TestFrog(arch, mode, system, ['--checked']) | 166 status = TestFrog(arch, mode, system, ['--checked']) |
| 175 if status != 0: | 167 if status != 0: |
| 176 print '@@@STEP_FAILURE@@@' | 168 print '@@@STEP_FAILURE@@@' |
| 177 | 169 |
| 178 return status | 170 return status |
| 179 | 171 |
| 180 | 172 |
| 181 if __name__ == '__main__': | 173 if __name__ == '__main__': |
| 182 sys.exit(main()) | 174 sys.exit(main()) |
| OLD | NEW |