OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 | 2 |
3 # Copyright (c) 2014 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2014 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 """Dartium buildbot steps | 7 """Dartium buildbot steps |
8 | 8 |
9 Archive dartium, content_shell, and chromedriver to the cloud storage bucket | 9 Archive dartium, content_shell, and chromedriver to the cloud storage bucket |
10 gs://dart-archive, and run tests, including the Dart layout tests. | 10 gs://dart-archive, and run tests, including the Dart layout tests. |
(...skipping 12 matching lines...) Expand all Loading... |
23 import utils | 23 import utils |
24 | 24 |
25 SRC_PATH = dartium_bot_utils.srcPath() | 25 SRC_PATH = dartium_bot_utils.srcPath() |
26 DART_PATH = os.path.join(SRC_PATH, 'dart') | 26 DART_PATH = os.path.join(SRC_PATH, 'dart') |
27 | 27 |
28 # We limit testing on drt since it takes a long time to run. | 28 # We limit testing on drt since it takes a long time to run. |
29 DRT_FILTER = 'html' | 29 DRT_FILTER = 'html' |
30 | 30 |
31 def RunDartTests(mode, component, suite, arch, checked, test_filter=None, | 31 def RunDartTests(mode, component, suite, arch, checked, test_filter=None, |
32 is_win_ninja=False): | 32 is_win_ninja=False): |
33 """Runs the Dart WebKit Layout tests. | 33 """Runs tests using the Dart test.py or the layout test runner. |
34 """ | 34 """ |
35 cmd = [sys.executable] | 35 cmd = [] |
| 36 if sys.platform.startswith('linux'): |
| 37 cmd = ['xvfb-run', '-a'] |
| 38 cmd.append(sys.executable) |
36 script = os.path.join(DART_PATH, 'tools', 'dartium', 'test.py') | 39 script = os.path.join(DART_PATH, 'tools', 'dartium', 'test.py') |
37 cmd.append(script) | 40 cmd.append(script) |
38 cmd.append('--buildbot') | 41 cmd.append('--buildbot') |
39 cmd.append('--mode=' + mode) | 42 cmd.append('--mode=' + mode) |
40 cmd.append('--component=' + component) | 43 cmd.append('--component=' + component) |
41 cmd.append('--suite=' + suite) | 44 cmd.append('--suite=' + suite) |
42 cmd.append('--arch=' + arch) | 45 cmd.append('--arch=' + arch) |
43 cmd.append('--' + checked) | 46 cmd.append('--' + checked) |
44 cmd.append('--no-show-results') | 47 cmd.append('--no-show-results') |
45 | 48 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 test_filter=DRT_FILTER) or result | 116 test_filter=DRT_FILTER) or result |
114 result = Test(info, 'drt', 'core', 'checked') or result | 117 result = Test(info, 'drt', 'core', 'checked') or result |
115 | 118 |
116 # On the 'be' channel, we only archive to the latest bucket if all tests were | 119 # On the 'be' channel, we only archive to the latest bucket if all tests were |
117 # successful. | 120 # successful. |
118 if result == 0 and info.channel == 'be': | 121 if result == 0 and info.channel == 'be': |
119 result = upload_steps.ArchiveAndUpload(info, archive_latest=True) or result | 122 result = upload_steps.ArchiveAndUpload(info, archive_latest=True) or result |
120 | 123 |
121 if __name__ == '__main__': | 124 if __name__ == '__main__': |
122 sys.exit(main()) | 125 sys.exit(main()) |
OLD | NEW |