| OLD | NEW |
| 1 var allTestFiles = []; | 1 var allTestFiles = []; |
| 2 var TEST_REGEXP = /(_test|_multi)\.js$/i; | 2 var TEST_REGEXP = /(_test|_multi)\.js$/i; |
| 3 | 3 |
| 4 var pathToModule = function(path) { | 4 var pathToModule = function(path) { |
| 5 return path.replace(/^\/base\//, '').replace(/\.js$/, ''); | 5 return path.replace(/^\/base\//, '').replace(/\.js$/, ''); |
| 6 }; | 6 }; |
| 7 | 7 |
| 8 var testsToSkip = [ | 8 var testsToSkip = [ |
| 9 // syntax error: | 9 // syntax error in DDC's generated code: |
| 10 '/base/gen/codegen_output/language/execute_finally6_test.js', | 10 '/base/gen/codegen_output/language/execute_finally6_test.js', |
| 11 '/base/gen/codegen_output/language/switch_label2_test.js', | 11 '/base/gen/codegen_output/language/switch_label2_test.js', |
| 12 '/base/gen/codegen_output/language/infinite_switch_label_test.js', | 12 '/base/gen/codegen_output/language/infinite_switch_label_test.js', |
| 13 '/base/gen/codegen_output/language/switch_label_test.js', | 13 '/base/gen/codegen_output/language/switch_label_test.js', |
| 14 '/base/gen/codegen_output/language/nested_switch_label_test.js', | 14 '/base/gen/codegen_output/language/nested_switch_label_test.js', |
| 15 '/base/gen/codegen_output/language/switch_try_catch_test.js', | 15 '/base/gen/codegen_output/language/switch_try_catch_test.js', |
| 16 | 16 |
| 17 // module code execution error: | 17 // module code execution error in DDC's generated code: |
| 18 '/base/gen/codegen_output/language/f_bounded_quantification3_test.js', | 18 '/base/gen/codegen_output/language/f_bounded_quantification3_test.js', |
| 19 '/base/gen/codegen_output/language/regress_16640_test.js', | 19 '/base/gen/codegen_output/language/regress_16640_test.js', |
| 20 '/base/gen/codegen_output/language/regress_22666_test.js', | 20 '/base/gen/codegen_output/language/regress_22666_test.js', |
| 21 '/base/gen/codegen_output/language/cyclic_type_test_00_multi.js', |
| 22 '/base/gen/codegen_output/language/cyclic_type_test_01_multi.js', |
| 23 '/base/gen/codegen_output/language/cyclic_type_test_02_multi.js', |
| 24 '/base/gen/codegen_output/language/cyclic_type_test_03_multi.js', |
| 25 '/base/gen/codegen_output/language/cyclic_type_test_04_multi.js', |
| 26 '/base/gen/codegen_output/language/cyclic_type_test_none_multi.js', |
| 21 '/base/gen/codegen_output/language/cyclic_type2_test.js', | 27 '/base/gen/codegen_output/language/cyclic_type2_test.js', |
| 22 '/base/gen/codegen_output/language/mixin_regress_13688_test.js', | 28 '/base/gen/codegen_output/language/mixin_regress_13688_test.js', |
| 29 '/base/gen/codegen_output/language/least_upper_bound_expansive_test_none_multi
.js' |
| 23 ]; | 30 ]; |
| 24 | 31 |
| 25 Object.keys(window.__karma__.files).forEach(function(file) { | 32 Object.keys(window.__karma__.files).forEach(function(file) { |
| 26 if (TEST_REGEXP.test(file) && testsToSkip.indexOf(file) == -1) { | 33 if (TEST_REGEXP.test(file) && testsToSkip.indexOf(file) == -1) { |
| 27 // Normalize paths to RequireJS module names. | 34 // Normalize paths to RequireJS module names. |
| 28 allTestFiles.push(pathToModule(file)); | 35 allTestFiles.push(pathToModule(file)); |
| 29 } | 36 } |
| 30 }); | 37 }); |
| 31 | 38 |
| 32 allTestFiles.push('test/browser/language_tests'); | 39 allTestFiles.push('test/browser/language_tests'); |
| 33 allTestFiles.push('test/browser/runtime_tests'); | 40 allTestFiles.push('test/browser/runtime_tests'); |
| 34 | 41 |
| 35 require.config({ | 42 require.config({ |
| 36 // Karma serves files under /base, which is the basePath from your config file | 43 // Karma serves files under /base. |
| 37 baseUrl: '/base', | 44 baseUrl: '/base', |
| 38 | 45 |
| 46 // Travis bots take a bit longer to load all ~2k test files. |
| 47 waitSeconds: 30, |
| 48 |
| 39 paths: { | 49 paths: { |
| 40 dart_sdk: 'lib/js/amd/dart_sdk', | 50 dart_sdk: 'lib/js/amd/dart_sdk', |
| 41 async_helper: 'gen/codegen_output/pkg/async_helper', | 51 async_helper: 'gen/codegen_output/pkg/async_helper', |
| 42 expect: 'gen/codegen_output/pkg/expect', | 52 expect: 'gen/codegen_output/pkg/expect', |
| 43 js: 'gen/codegen_output/pkg/js', | 53 js: 'gen/codegen_output/pkg/js', |
| 44 matcher: 'gen/codegen_output/pkg/matcher', | 54 matcher: 'gen/codegen_output/pkg/matcher', |
| 45 path: 'gen/codegen_output/pkg/path', | 55 path: 'gen/codegen_output/pkg/path', |
| 46 stack_trace: 'gen/codegen_output/pkg/stack_trace', | 56 stack_trace: 'gen/codegen_output/pkg/stack_trace', |
| 47 unittest: 'gen/codegen_output/pkg/unittest', | 57 unittest: 'gen/codegen_output/pkg/unittest', |
| 48 }, | 58 }, |
| 49 | 59 |
| 50 // dynamically load all test files | 60 // Require all test files before starting tests. |
| 51 deps: allTestFiles, | 61 deps: allTestFiles, |
| 52 | 62 |
| 53 // we have to kickoff jasmine, as it is asynchronous | 63 // We have to kickoff jasmine, as it is asynchronous |
| 54 callback: window.__karma__.start | 64 callback: window.__karma__.start |
| 55 }); | 65 }); |
| OLD | NEW |