| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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_options_parser"); | 5 #library("test_options_parser"); |
| 6 | 6 |
| 7 #import("dart:io"); | 7 #import("dart:io"); |
| 8 #import("drt_updater.dart"); |
| 8 | 9 |
| 9 List<String> defaultTestSelectors = | 10 List<String> defaultTestSelectors = |
| 10 const ['dartc', 'samples', 'standalone', 'corelib', 'co19', 'language', | 11 const ['dartc', 'samples', 'standalone', 'corelib', 'co19', 'language', |
| 11 'isolate', 'vm', 'client', 'dartdoc', 'utils']; | 12 'isolate', 'vm', 'client', 'dartdoc', 'utils']; |
| 12 | 13 |
| 13 /** | 14 /** |
| 14 * Specification of a single test option. | 15 * Specification of a single test option. |
| 15 * | 16 * |
| 16 * The name of the specification is used as the key for the option in | 17 * The name of the specification is used as the key for the option in |
| 17 * the Map returned from the [TestOptionParser] parse method. | 18 * the Map returned from the [TestOptionParser] parse method. |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 // Expand components. | 450 // Expand components. |
| 450 var components = configuration['component']; | 451 var components = configuration['component']; |
| 451 if (components.contains(',')) { | 452 if (components.contains(',')) { |
| 452 var result = new List<Map>(); | 453 var result = new List<Map>(); |
| 453 for (var component in components.split(',')) { | 454 for (var component in components.split(',')) { |
| 454 var newConfiguration = new Map.from(configuration); | 455 var newConfiguration = new Map.from(configuration); |
| 455 newConfiguration['component'] = component; | 456 newConfiguration['component'] = component; |
| 456 result.addAll(_expandConfigurations(newConfiguration)); | 457 result.addAll(_expandConfigurations(newConfiguration)); |
| 457 } | 458 } |
| 458 return result; | 459 return result; |
| 460 } else { |
| 461 // All components eventually go through this path, after expansion. |
| 462 if (DumpRenderTreeUpdater.componentRequiresDRT(components)) { |
| 463 DumpRenderTreeUpdater.update(); |
| 464 } |
| 459 } | 465 } |
| 460 | 466 |
| 461 // Adjust default timeout based on mode and component. | 467 // Adjust default timeout based on mode and component. |
| 462 if (configuration['timeout'] == -1) { | 468 if (configuration['timeout'] == -1) { |
| 463 var timeout = 60; | 469 var timeout = 60; |
| 464 switch (configuration['component']) { | 470 switch (configuration['component']) { |
| 465 case 'dartc': | 471 case 'dartc': |
| 466 case 'chromium': | 472 case 'chromium': |
| 467 case 'dartium': | 473 case 'dartium': |
| 468 case 'frogium': | 474 case 'frogium': |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 return option; | 542 return option; |
| 537 } | 543 } |
| 538 } | 544 } |
| 539 print('Unknown test option $name'); | 545 print('Unknown test option $name'); |
| 540 exit(1); | 546 exit(1); |
| 541 } | 547 } |
| 542 | 548 |
| 543 | 549 |
| 544 List<_TestOptionSpecification> _options; | 550 List<_TestOptionSpecification> _options; |
| 545 } | 551 } |
| OLD | NEW |