| 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) 2011, 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 | 8 |
| 9 #library("test"); | 9 #library("test"); |
| 10 | 10 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 List<Map> configurations = optionsParser.parse(new Options().arguments); | 25 List<Map> configurations = optionsParser.parse(new Options().arguments); |
| 26 if (configurations == null) return; | 26 if (configurations == null) return; |
| 27 | 27 |
| 28 // Extract global options from first configuration. | 28 // Extract global options from first configuration. |
| 29 var firstConf = configurations[0]; | 29 var firstConf = configurations[0]; |
| 30 Map<String, RegExp> selectors = firstConf['selectors']; | 30 Map<String, RegExp> selectors = firstConf['selectors']; |
| 31 var maxProcesses = firstConf['tasks']; | 31 var maxProcesses = firstConf['tasks']; |
| 32 var progressIndicator = firstConf['progress']; | 32 var progressIndicator = firstConf['progress']; |
| 33 var verbose = firstConf['verbose']; | 33 var verbose = firstConf['verbose']; |
| 34 var printTiming = firstConf['time']; | 34 var printTiming = firstConf['time']; |
| 35 var listTests = firstConf['list']; |
| 35 | 36 |
| 36 var configurationIterator = configurations.iterator(); | 37 var configurationIterator = configurations.iterator(); |
| 37 bool enqueueConfiguration(ProcessQueue queue) { | 38 bool enqueueConfiguration(ProcessQueue queue) { |
| 38 if (!configurationIterator.hasNext()) { | 39 if (!configurationIterator.hasNext()) { |
| 39 return false; | 40 return false; |
| 40 } | 41 } |
| 41 | 42 |
| 42 var conf = configurationIterator.next(); | 43 var conf = configurationIterator.next(); |
| 43 if (selectors.containsKey('standalone')) { | 44 if (selectors.containsKey('standalone')) { |
| 44 queue.addTestSuite(new StandaloneTestSuite(conf)); | 45 queue.addTestSuite(new StandaloneTestSuite(conf)); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 61 if (conf['component'] == 'vm' && selectors.containsKey('vm')) { | 62 if (conf['component'] == 'vm' && selectors.containsKey('vm')) { |
| 62 queue.addTestSuite(new VMTestSuite(conf)); | 63 queue.addTestSuite(new VMTestSuite(conf)); |
| 63 } | 64 } |
| 64 | 65 |
| 65 return true; | 66 return true; |
| 66 } | 67 } |
| 67 | 68 |
| 68 // Start process queue. | 69 // Start process queue. |
| 69 var queue = new ProcessQueue(maxProcesses, | 70 var queue = new ProcessQueue(maxProcesses, |
| 70 progressIndicator, | 71 progressIndicator, |
| 71 verbose, | |
| 72 startTime, | 72 startTime, |
| 73 printTiming, | 73 printTiming, |
| 74 enqueueConfiguration); | 74 enqueueConfiguration, |
| 75 verbose: verbose, |
| 76 listTests: listTests); |
| 75 } | 77 } |
| OLD | NEW |