| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 testpy_mode = 'release' | 46 testpy_mode = 'release' |
| 47 flags = None | 47 flags = None |
| 48 if mode == 'debug': | 48 if mode == 'debug': |
| 49 flags = '--checked' | 49 flags = '--checked' |
| 50 return (testpy_mode, flags) | 50 return (testpy_mode, flags) |
| 51 | 51 |
| 52 def TestStep(name, mode, component, targets, flags): | 52 def TestStep(name, mode, component, targets, flags): |
| 53 print '@@@BUILD_STEP %s tests: %s@@@' % (name, component) | 53 print '@@@BUILD_STEP %s tests: %s@@@' % (name, component) |
| 54 if component == 'frogium': | 54 if component == 'frogium': |
| 55 cmd = ['xvfb-run'] | 55 cmd = ['xvfb-run'] |
| 56 test_script = '../tools/test.py' | |
| 57 else: | 56 else: |
| 58 cmd = [] | 57 cmd = [] |
| 59 test_script = '../tools/test_wrapper.py' | |
| 60 | 58 |
| 61 cmd = (cmd | 59 cmd = (cmd |
| 62 + [sys.executable, | 60 + [sys.executable, |
| 63 test_script, | 61 '../tools/test_wrapper.py', |
| 64 '--mode=' + mode, | 62 '--mode=' + mode, |
| 65 '--component=' + component, | 63 '--component=' + component, |
| 66 '--time', | 64 '--time', |
| 67 '--report', | 65 '--report', |
| 68 '--progress=buildbot', | 66 '--progress=buildbot', |
| 69 '-v'] | 67 '-v'] |
| 70 + targets) | 68 + targets) |
| 71 if flags: | 69 if flags: |
| 72 cmd.append(flags) | 70 cmd.append(flags) |
| 73 exit_code = subprocess.call(cmd, env=NO_COLOR_ENV) | 71 exit_code = subprocess.call(cmd, env=NO_COLOR_ENV) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 return 1 | 122 return 1 |
| 125 | 123 |
| 126 status = TestFrog(arch, mode) | 124 status = TestFrog(arch, mode) |
| 127 if status != 0: | 125 if status != 0: |
| 128 print '@@@STEP_FAILURE@@@' | 126 print '@@@STEP_FAILURE@@@' |
| 129 return status | 127 return status |
| 130 | 128 |
| 131 | 129 |
| 132 if __name__ == '__main__': | 130 if __name__ == '__main__': |
| 133 sys.exit(main()) | 131 sys.exit(main()) |
| OLD | NEW |