OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library test_configurations; | 5 library test_configurations; |
6 | 6 |
7 import "dart:async"; | 7 import "dart:async"; |
8 import 'dart:io'; | 8 import 'dart:io'; |
9 import "dart:math" as math; | 9 import "dart:math" as math; |
10 | 10 |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 // Print the configurations being run by this execution of | 92 // Print the configurations being run by this execution of |
93 // test.dart. However, don't do it if the silent progress indicator | 93 // test.dart. However, don't do it if the silent progress indicator |
94 // is used. This is only needed because of the junit tests. | 94 // is used. This is only needed because of the junit tests. |
95 if (progressIndicator != 'silent') { | 95 if (progressIndicator != 'silent') { |
96 List output_words = configurations.length > 1 ? | 96 List output_words = configurations.length > 1 ? |
97 ['Test configurations:'] : ['Test configuration:']; | 97 ['Test configurations:'] : ['Test configuration:']; |
98 for (Map conf in configurations) { | 98 for (Map conf in configurations) { |
99 List settings = ['compiler', 'runtime', 'mode', 'arch'] | 99 List settings = ['compiler', 'runtime', 'mode', 'arch'] |
100 .map((name) => conf[name]).toList(); | 100 .map((name) => conf[name]).toList(); |
101 if (conf['checked']) settings.add('checked'); | 101 if (conf['checked']) settings.add('checked'); |
| 102 if (conf['noopt']) settings.add('noopt'); |
102 output_words.add(settings.join('_')); | 103 output_words.add(settings.join('_')); |
103 } | 104 } |
104 print(output_words.join(' ')); | 105 print(output_words.join(' ')); |
105 } | 106 } |
106 | 107 |
107 var runningBrowserTests = configurations.any((config) { | 108 var runningBrowserTests = configurations.any((config) { |
108 return TestUtils.isBrowserRuntime(config['runtime']); | 109 return TestUtils.isBrowserRuntime(config['runtime']); |
109 }); | 110 }); |
110 | 111 |
111 List<Future> serverFutures = []; | 112 List<Future> serverFutures = []; |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 recordingOutputPath); | 282 recordingOutputPath); |
282 } | 283 } |
283 | 284 |
284 // Start all the HTTP servers required before starting the process queue. | 285 // Start all the HTTP servers required before starting the process queue. |
285 if (serverFutures.isEmpty) { | 286 if (serverFutures.isEmpty) { |
286 startProcessQueue(); | 287 startProcessQueue(); |
287 } else { | 288 } else { |
288 Future.wait(serverFutures).then((_) => startProcessQueue()); | 289 Future.wait(serverFutures).then((_) => startProcessQueue()); |
289 } | 290 } |
290 } | 291 } |
OLD | NEW |