| 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 |
| 197 utils.runCommand(['python', | 198 utils.runCommand(['python', |
| 198 test_script, | 199 test_script, |
| 199 test_mode, | 200 test_mode, |
| 200 show_results, | 201 show_results, |
| 201 '--time-out-ms', str(timeout), | 202 '--time-out-ms', str(timeout), |
| 202 # Temporary hack to fix issue with svn vs. svn.bat. | 203 # Temporary hack to fix issue with svn vs. svn.bat. |
| 203 '--builder-name', 'BuildBot', | 204 '--builder-name', 'BuildBot', |
| 204 '--additional-env-var', | 205 '--additional-env-var', |
| 205 'DART_FLAGS=%s' % dart_flags, | 206 'DART_FLAGS=%s' % dart_flags, |
| 206 test]) | 207 test]) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 224 return 1 | 225 return 1 |
| 225 else: | 226 else: |
| 226 return 0 | 227 return 0 |
| 227 | 228 |
| 228 if __name__ == '__main__': | 229 if __name__ == '__main__': |
| 229 try: | 230 try: |
| 230 sys.exit(main()) | 231 sys.exit(main()) |
| 231 except StandardError as e: | 232 except StandardError as e: |
| 232 print 'Fail: ' + str(e) | 233 print 'Fail: ' + str(e) |
| 233 sys.exit(1) | 234 sys.exit(1) |
| OLD | NEW |