| OLD | NEW |
| 1 #!/usr/bin/env dart | 1 #!/usr/bin/env dart |
| 2 // Copyright (c) 2012, 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 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 var maxProcesses = firstConf['tasks']; | 46 var maxProcesses = firstConf['tasks']; |
| 47 var progressIndicator = firstConf['progress']; | 47 var progressIndicator = firstConf['progress']; |
| 48 var verbose = firstConf['verbose']; | 48 var verbose = firstConf['verbose']; |
| 49 var printTiming = firstConf['time']; | 49 var printTiming = firstConf['time']; |
| 50 var listTests = firstConf['list']; | 50 var listTests = firstConf['list']; |
| 51 | 51 |
| 52 // Print the configurations being run by this execution of | 52 // Print the configurations being run by this execution of |
| 53 // test.dart. However, don't do it if the silent progress indicator | 53 // test.dart. However, don't do it if the silent progress indicator |
| 54 // is used. This is only needed because of the junit tests. | 54 // is used. This is only needed because of the junit tests. |
| 55 if (progressIndicator != 'silent') { | 55 if (progressIndicator != 'silent') { |
| 56 StringBuffer sb = new StringBuffer('Test configuration'); | 56 List output_words = configurations.length > 1 ? |
| 57 sb.add(configurations.length > 1 ? 's:' : ':'); | 57 ['Test configurations:'] : ['Test configuration:']; |
| 58 for (Map conf in configurations) { | 58 for (Map conf in configurations) { |
| 59 sb.add(' ${conf["compiler"]}_${conf["runtime"]}_${conf["mode"]}_' + | 59 List settings = |
| 60 '${conf["arch"]}'); | 60 ['compiler', 'runtime', 'mode', 'arch'].map((name) => conf[name]); |
| 61 if (conf['checked']) sb.add('_checked'); | 61 if (conf['checked']) settings.add('checked'); |
| 62 output_words.add(Strings.join(settings, '_')); |
| 62 } | 63 } |
| 63 print(sb); | 64 print(Strings.join(output_words, ' ')); |
| 64 } | 65 } |
| 65 | 66 |
| 66 var configurationIterator = configurations.iterator(); | 67 var configurationIterator = configurations.iterator(); |
| 67 bool enqueueConfiguration(ProcessQueue queue) { | 68 bool enqueueConfiguration(ProcessQueue queue) { |
| 68 if (!configurationIterator.hasNext()) { | 69 if (!configurationIterator.hasNext()) { |
| 69 return false; | 70 return false; |
| 70 } | 71 } |
| 71 | 72 |
| 72 var conf = configurationIterator.next(); | 73 var conf = configurationIterator.next(); |
| 73 if (selectors.containsKey('co19')) { | 74 if (selectors.containsKey('co19')) { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 92 | 93 |
| 93 // Start process queue. | 94 // Start process queue. |
| 94 var queue = new ProcessQueue(maxProcesses, | 95 var queue = new ProcessQueue(maxProcesses, |
| 95 progressIndicator, | 96 progressIndicator, |
| 96 startTime, | 97 startTime, |
| 97 printTiming, | 98 printTiming, |
| 98 enqueueConfiguration, | 99 enqueueConfiguration, |
| 99 verbose, | 100 verbose, |
| 100 listTests); | 101 listTests); |
| 101 } | 102 } |
| OLD | NEW |