| Index: test-main.js
|
| diff --git a/test-main.js b/test-main.js
|
| index ad7c639f4da8db358f10ead0ab9f85fa93c38e8d..9ac99212082638f20060b2e43c70107975f91670 100644
|
| --- a/test-main.js
|
| +++ b/test-main.js
|
| @@ -1,21 +1,52 @@
|
| var allTestFiles = [];
|
| -var TEST_REGEXP = /(spec|test)\.js$/i;
|
| +var TEST_REGEXP = /(_test|_multi)\.js$/i;
|
|
|
| var pathToModule = function(path) {
|
| return path.replace(/^\/base\//, '').replace(/\.js$/, '');
|
| };
|
|
|
| +var testsToSkip = [
|
| + // syntax error:
|
| + '/base/gen/codegen_output/language/execute_finally6_test.js',
|
| + '/base/gen/codegen_output/language/switch_label2_test.js',
|
| + '/base/gen/codegen_output/language/infinite_switch_label_test.js',
|
| + '/base/gen/codegen_output/language/switch_label_test.js',
|
| + '/base/gen/codegen_output/language/nested_switch_label_test.js',
|
| + '/base/gen/codegen_output/language/switch_try_catch_test.js',
|
| +
|
| + // module code execution error:
|
| + '/base/gen/codegen_output/language/f_bounded_quantification3_test.js',
|
| + '/base/gen/codegen_output/language/regress_16640_test.js',
|
| + '/base/gen/codegen_output/language/regress_22666_test.js',
|
| + '/base/gen/codegen_output/language/cyclic_type2_test.js',
|
| + '/base/gen/codegen_output/language/mixin_regress_13688_test.js',
|
| +];
|
| +
|
| Object.keys(window.__karma__.files).forEach(function(file) {
|
| - if (TEST_REGEXP.test(file)) {
|
| + if (TEST_REGEXP.test(file) && testsToSkip.indexOf(file) == -1) {
|
| // Normalize paths to RequireJS module names.
|
| allTestFiles.push(pathToModule(file));
|
| }
|
| });
|
|
|
| +allTestFiles.push('test/browser/language_tests');
|
| +allTestFiles.push('test/browser/runtime_tests');
|
| +
|
| require.config({
|
| // Karma serves files under /base, which is the basePath from your config file
|
| baseUrl: '/base',
|
|
|
| + paths: {
|
| + dart_sdk: 'lib/js/amd/dart_sdk',
|
| + async_helper: 'gen/codegen_output/pkg/async_helper',
|
| + expect: 'gen/codegen_output/pkg/expect',
|
| + js: 'gen/codegen_output/pkg/js',
|
| + matcher: 'gen/codegen_output/pkg/matcher',
|
| + path: 'gen/codegen_output/pkg/path',
|
| + stack_trace: 'gen/codegen_output/pkg/stack_trace',
|
| + unittest: 'gen/codegen_output/pkg/unittest',
|
| + },
|
| +
|
| // dynamically load all test files
|
| deps: allTestFiles,
|
|
|
|
|