OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright 2011 Google Inc. All Rights Reserved. | 3 # Copyright 2011 Google Inc. All Rights Reserved. |
4 | 4 |
5 import fnmatch | 5 import fnmatch |
6 import optparse | 6 import optparse |
7 import os | 7 import os |
8 import re | 8 import re |
9 import shutil | 9 import shutil |
10 import subprocess | 10 import subprocess |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 if ('layout' in suites and | 187 if ('layout' in suites and |
188 'layout' in TEST_INFO[component] and | 188 'layout' in TEST_INFO[component] and |
189 checkmode in TEST_INFO[component]['layout']): | 189 checkmode in TEST_INFO[component]['layout']): |
190 # Run layout tests in this mode | 190 # Run layout tests in this mode |
191 dart_flags = ' '.join(TEST_INFO[component]['layout'][checkmode]) | 191 dart_flags = ' '.join(TEST_INFO[component]['layout'][checkmode]) |
192 | 192 |
193 if options.layout_test: | 193 if options.layout_test: |
194 test = os.path.join(DART_TEST_DIR, options.layout_test) | 194 test = os.path.join(DART_TEST_DIR, options.layout_test) |
195 else: | 195 else: |
196 test = DART_TEST_DIR | 196 test = DART_TEST_DIR |
197 package_root = os.path.join(build_dir, 'packages') | |
198 utils.runCommand(['python', | 197 utils.runCommand(['python', |
199 test_script, | 198 test_script, |
200 test_mode, | 199 test_mode, |
201 show_results, | 200 show_results, |
202 '--time-out-ms', str(timeout), | 201 '--time-out-ms', str(timeout), |
203 # Temporary hack to fix issue with svn vs. svn.bat. | 202 # Temporary hack to fix issue with svn vs. svn.bat. |
204 '--builder-name', 'BuildBot', | 203 '--builder-name', 'BuildBot', |
205 '--additional-env-var', | 204 '--additional-env-var', |
206 'DART_FLAGS=%s' % dart_flags, | 205 'DART_FLAGS=%s' % dart_flags, |
207 '--additional-env-var', | |
208 'DART_PACKAGE_ROOT=file://%s' % package_root, | |
209 test]) | 206 test]) |
210 | 207 |
211 # Run core dart tests | 208 # Run core dart tests |
212 if ('core' in suites and | 209 if ('core' in suites and |
213 'core' in TEST_INFO[component] and | 210 'core' in TEST_INFO[component] and |
214 checkmode in TEST_INFO[component]['core']): | 211 checkmode in TEST_INFO[component]['core']): |
215 core_flags = TEST_INFO[component]['core'][checkmode] | 212 core_flags = TEST_INFO[component]['core'][checkmode] |
216 core_flags = map(lambda flag: flag % executable_map, core_flags) | 213 core_flags = map(lambda flag: flag % executable_map, core_flags) |
217 if options.buildbot: | 214 if options.buildbot: |
218 core_flags = ['--progress=buildbot'] + core_flags | 215 core_flags = ['--progress=buildbot'] + core_flags |
219 tester = os.path.join(srcpath, 'dart', 'tools', 'test.py') | 216 tester = os.path.join(srcpath, 'dart', 'tools', 'test.py') |
220 test_filter = [options.test_filter] if options.test_filter else [] | 217 test_filter = [options.test_filter] if options.test_filter else [] |
221 utils.runCommand(['python', tester] + core_flags + test_filter) | 218 utils.runCommand(['python', tester] + core_flags + test_filter) |
222 except (StandardError, Exception) as e: | 219 except (StandardError, Exception) as e: |
223 print 'Fail: ' + str(e) | 220 print 'Fail: ' + str(e) |
224 errors = True | 221 errors = True |
225 | 222 |
226 if errors: | 223 if errors: |
227 return 1 | 224 return 1 |
228 else: | 225 else: |
229 return 0 | 226 return 0 |
230 | 227 |
231 if __name__ == '__main__': | 228 if __name__ == '__main__': |
232 try: | 229 try: |
233 sys.exit(main()) | 230 sys.exit(main()) |
234 except StandardError as e: | 231 except StandardError as e: |
235 print 'Fail: ' + str(e) | 232 print 'Fail: ' + str(e) |
236 sys.exit(1) | 233 sys.exit(1) |
OLD | NEW |