| 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 /** | 5 /** |
| 6 * The command line and other arguments passed to the test runner are | 6 * The command line and other arguments passed to the test runner are |
| 7 * gathered into a global [Configuration] instance that controls the | 7 * gathered into a global [Configuration] instance that controls the |
| 8 * execution. For details on the various options here see | 8 * execution. For details on the various options here see |
| 9 * [getOptionParser]. | 9 * [getOptionParser]. |
| 10 */ | 10 */ |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 final List excludeFilter; | 27 final List excludeFilter; |
| 28 final int timeout; | 28 final int timeout; |
| 29 final String runtime; | 29 final String runtime; |
| 30 final bool checkedMode; | 30 final bool checkedMode; |
| 31 final bool keepTests; | 31 final bool keepTests; |
| 32 final bool stopOnFailure; | 32 final bool stopOnFailure; |
| 33 final int maxTasks; | 33 final int maxTasks; |
| 34 final String outputStream; | 34 final String outputStream; |
| 35 final String logStream; | 35 final String logStream; |
| 36 final String tempDir; | 36 final String tempDir; |
| 37 final bool generateRenders; |
| 37 String dart2jsPath; | 38 String dart2jsPath; |
| 38 String drtPath; | 39 String drtPath; |
| 39 String dartPath; | 40 String dartPath; |
| 40 bool filtering; | 41 bool filtering; |
| 41 | 42 |
| 42 Configuration(ArgParser parser, ArgResults options) : | 43 Configuration(ArgParser parser, ArgResults options) : |
| 43 unittestPath = makePathAbsolute(options['unittest']), | 44 unittestPath = makePathAbsolute(options['unittest']), |
| 44 runIsolated = options['isolate'], | 45 runIsolated = options['isolate'], |
| 45 runInBrowser = (options['runtime'] != 'vm'), | 46 runInBrowser = (options['runtime'] != 'vm'), |
| 46 verbose = (options['log'] != 'none' && !options['list-groups']), | 47 verbose = (options['log'] != 'none' && !options['list-groups']), |
| (...skipping 11 matching lines...) Expand all Loading... |
| 58 excludeFilter = options['exclude'], | 59 excludeFilter = options['exclude'], |
| 59 timeout = parseInt(options['timeout']), | 60 timeout = parseInt(options['timeout']), |
| 60 runtime = options['runtime'], | 61 runtime = options['runtime'], |
| 61 checkedMode = options['checked'], | 62 checkedMode = options['checked'], |
| 62 keepTests = (options['keep-files'] && | 63 keepTests = (options['keep-files'] && |
| 63 !(options['list-groups'] || options['list-tests'])), | 64 !(options['list-groups'] || options['list-tests'])), |
| 64 stopOnFailure = options['stop-on-failure'], | 65 stopOnFailure = options['stop-on-failure'], |
| 65 maxTasks = parseInt(options['tasks']), | 66 maxTasks = parseInt(options['tasks']), |
| 66 outputStream = options['out'], | 67 outputStream = options['out'], |
| 67 logStream = options['log'], | 68 logStream = options['log'], |
| 68 tempDir = options['tempdir'] { | 69 tempDir = options['tempdir'], |
| 70 generateRenders = options['generate-renders'] { |
| 69 filtering = (includeFilter.length > 0 || excludeFilter.length > 0); | 71 filtering = (includeFilter.length > 0 || excludeFilter.length > 0); |
| 70 var dartsdk = options['dartsdk']; | 72 var dartsdk = options['dartsdk']; |
| 71 var pathSep = Platform.pathSeparator; | 73 var pathSep = Platform.pathSeparator; |
| 72 | 74 |
| 73 if (dartsdk == null || | 75 if (dartsdk == null || |
| 74 parser.getDefault('dart2js') != options['dart2js']) { | 76 parser.getDefault('dart2js') != options['dart2js']) { |
| 75 dart2jsPath = options['dart2js']; | 77 dart2jsPath = options['dart2js']; |
| 76 } else { | 78 } else { |
| 77 dart2jsPath = '$dartsdk${pathSep}dart-sdk${pathSep}bin${pathSep}dart2js'; | 79 dart2jsPath = '$dartsdk${pathSep}dart-sdk${pathSep}bin${pathSep}dart2js'; |
| 78 } | 80 } |
| 79 | 81 |
| 80 if (dartsdk == null || | 82 if (dartsdk == null || |
| 81 parser.getDefault('dart') != options['dart']) { | 83 parser.getDefault('dart') != options['dart']) { |
| 82 dartPath = options['dart']; | 84 dartPath = options['dart']; |
| 83 } else { | 85 } else { |
| 84 dartPath = '$dartsdk${pathSep}dart-sdk${pathSep}bin${pathSep}dart'; | 86 dartPath = '$dartsdk${pathSep}dart-sdk${pathSep}bin${pathSep}dart'; |
| 85 } | 87 } |
| 86 | 88 |
| 87 if (dartsdk == null || | 89 if (dartsdk == null || |
| 88 parser.getDefault('drt') != options['drt']) { | 90 parser.getDefault('drt') != options['drt']) { |
| 89 drtPath = options['drt']; | 91 drtPath = options['drt']; |
| 90 } else { | 92 } else { |
| 91 drtPath = '$dartsdk${pathSep}chromium${pathSep}DumpRenderTree'; | 93 drtPath = '$dartsdk${pathSep}chromium${pathSep}DumpRenderTree'; |
| 92 } | 94 } |
| 93 } | 95 } |
| 94 } | 96 } |
| OLD | NEW |