| OLD | NEW |
| 1 #!/usr/bin/env dart | 1 #!/usr/bin/env dart |
| 2 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 2 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 3 // for details. All rights reserved. Use of this source code is governed by a | 3 // for details. All rights reserved. Use of this source code is governed by a |
| 4 // BSD-style license that can be found in the LICENSE file. | 4 // BSD-style license that can be found in the LICENSE file. |
| 5 | 5 |
| 6 // TODO(ager): Get rid of this version of test.dart when we don't have | 6 // TODO(ager): Get rid of this version of test.dart when we don't have |
| 7 // to worry about the special runtime checkout anymore. | 7 // to worry about the special runtime checkout anymore. |
| 8 // This file is identical to test.dart with test suites in the | 8 // This file is identical to test.dart with test suites in the |
| 9 // directories samples, client, compiler, frog, and utils removed. | 9 // directories samples, client, compiler, frog, and utils removed. |
| 10 | 10 |
| 11 #library("test"); | 11 #library("test"); |
| 12 | 12 |
| 13 #import("testing/dart/test_runner.dart"); | 13 #import("testing/dart/test_runner.dart"); |
| 14 #import("testing/dart/test_options.dart"); | 14 #import("testing/dart/test_options.dart"); |
| 15 | 15 |
| 16 #import("../tests/co19/test_config.dart"); | 16 #import("../tests/co19/test_config.dart"); |
| 17 #import("../tests/corelib/test_config.dart"); | 17 #import("../tests/corelib/test_config.dart"); |
| 18 #import("../tests/isolate/test_config.dart"); | 18 #import("../tests/isolate/test_config.dart"); |
| 19 #import("../tests/language/test_config.dart"); | 19 #import("../tests/language/test_config.dart"); |
| 20 #import("../tests/standalone/test_config.dart"); | 20 #import("../tests/standalone/test_config.dart"); |
| 21 #import("../tests/stub-generator/test_config.dart"); | 21 #import("../tests/stub-generator/test_config.dart"); |
| 22 #import("../tests/utils/test_config.dart"); |
| 22 #import("../runtime/tests/vm/test_config.dart"); | 23 #import("../runtime/tests/vm/test_config.dart"); |
| 23 | 24 |
| 24 main() { | 25 main() { |
| 25 var startTime = new Date.now(); | 26 var startTime = new Date.now(); |
| 26 var optionsParser = new TestOptionsParser(); | 27 var optionsParser = new TestOptionsParser(); |
| 27 List<Map> configurations = optionsParser.parse(new Options().arguments); | 28 List<Map> configurations = optionsParser.parse(new Options().arguments); |
| 28 if (configurations == null) return; | 29 if (configurations == null) return; |
| 29 | 30 |
| 30 // Extract global options from first configuration. | 31 // Extract global options from first configuration. |
| 31 var firstConf = configurations[0]; | 32 var firstConf = configurations[0]; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 55 } | 56 } |
| 56 if (selectors.containsKey('language')) { | 57 if (selectors.containsKey('language')) { |
| 57 queue.addTestSuite(new LanguageTestSuite(conf)); | 58 queue.addTestSuite(new LanguageTestSuite(conf)); |
| 58 } | 59 } |
| 59 if (selectors.containsKey('isolate')) { | 60 if (selectors.containsKey('isolate')) { |
| 60 queue.addTestSuite(new IsolateTestSuite(conf)); | 61 queue.addTestSuite(new IsolateTestSuite(conf)); |
| 61 } | 62 } |
| 62 if (selectors.containsKey('stub-generator')) { | 63 if (selectors.containsKey('stub-generator')) { |
| 63 queue.addTestSuite(new StubGeneratorTestSuite(conf)); | 64 queue.addTestSuite(new StubGeneratorTestSuite(conf)); |
| 64 } | 65 } |
| 66 if (selectors.containsKey('utils')) { |
| 67 queue.addTestSuite(new UtilsTestSuite(conf)); |
| 68 } |
| 65 if (conf['component'] == 'vm' && selectors.containsKey('vm')) { | 69 if (conf['component'] == 'vm' && selectors.containsKey('vm')) { |
| 66 queue.addTestSuite(new VMTestSuite(conf)); | 70 queue.addTestSuite(new VMTestSuite(conf)); |
| 67 } | 71 } |
| 68 | 72 |
| 69 return true; | 73 return true; |
| 70 } | 74 } |
| 71 | 75 |
| 72 // Start process queue. | 76 // Start process queue. |
| 73 var queue = new ProcessQueue(maxProcesses, | 77 var queue = new ProcessQueue(maxProcesses, |
| 74 progressIndicator, | 78 progressIndicator, |
| 75 startTime, | 79 startTime, |
| 76 printTiming, | 80 printTiming, |
| 77 enqueueConfiguration, | 81 enqueueConfiguration, |
| 78 verbose, | 82 verbose, |
| 79 listTests, | 83 listTests, |
| 80 keepGeneratedTests); | 84 keepGeneratedTests); |
| 81 } | 85 } |
| OLD | NEW |