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 26 matching lines...) Expand all Loading... |
37 var listTests = firstConf['list']; | 37 var listTests = firstConf['list']; |
38 var keepGeneratedTests = firstConf['keep-generated-tests']; | 38 var keepGeneratedTests = firstConf['keep-generated-tests']; |
39 | 39 |
40 // Print the configurations being run by this execution of | 40 // Print the configurations being run by this execution of |
41 // test.dart. However, don't do it if the silent progress indicator | 41 // test.dart. However, don't do it if the silent progress indicator |
42 // is used. This is only needed because of the junit tests. | 42 // is used. This is only needed because of the junit tests. |
43 if (progressIndicator != 'silent') { | 43 if (progressIndicator != 'silent') { |
44 StringBuffer sb = new StringBuffer('Test configuration'); | 44 StringBuffer sb = new StringBuffer('Test configuration'); |
45 sb.add(configurations.length > 1 ? 's:' : ':'); | 45 sb.add(configurations.length > 1 ? 's:' : ':'); |
46 for (Map conf in configurations) { | 46 for (Map conf in configurations) { |
47 sb.add(' ${conf["component"]}_${conf["mode"]}_${conf["arch"]}'); | 47 sb.add(' ${conf["compiler"]}_${conf["runtime"]}_${conf["mode"]}_' + |
| 48 '${conf["arch"]}'); |
48 if (conf['checked']) sb.add('_checked'); | 49 if (conf['checked']) sb.add('_checked'); |
49 } | 50 } |
50 print(sb); | 51 print(sb); |
51 } | 52 } |
52 | 53 |
53 var configurationIterator = configurations.iterator(); | 54 var configurationIterator = configurations.iterator(); |
54 bool enqueueConfiguration(ProcessQueue queue) { | 55 bool enqueueConfiguration(ProcessQueue queue) { |
55 if (!configurationIterator.hasNext()) { | 56 if (!configurationIterator.hasNext()) { |
56 return false; | 57 return false; |
57 } | 58 } |
(...skipping 28 matching lines...) Expand all Loading... |
86 // Start process queue. | 87 // Start process queue. |
87 var queue = new ProcessQueue(maxProcesses, | 88 var queue = new ProcessQueue(maxProcesses, |
88 progressIndicator, | 89 progressIndicator, |
89 startTime, | 90 startTime, |
90 printTiming, | 91 printTiming, |
91 enqueueConfiguration, | 92 enqueueConfiguration, |
92 verbose, | 93 verbose, |
93 listTests, | 94 listTests, |
94 keepGeneratedTests); | 95 keepGeneratedTests); |
95 } | 96 } |
OLD | NEW |