| 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  * Classes and methods for enumerating and preparing tests. | 6  * Classes and methods for enumerating and preparing tests. | 
| 7  * | 7  * | 
| 8  * This library includes: | 8  * This library includes: | 
| 9  * | 9  * | 
| 10  * - Creating tests by listing all the Dart files in certain directories, | 10  * - Creating tests by listing all the Dart files in certain directories, | 
| (...skipping 1745 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1756       "otherScripts": otherScripts, | 1756       "otherScripts": otherScripts, | 
| 1757       "isMultitest": isMultitest, | 1757       "isMultitest": isMultitest, | 
| 1758       "isMultiHtmlTest": isMultiHtmlTest, | 1758       "isMultiHtmlTest": isMultiHtmlTest, | 
| 1759       "subtestNames": subtestNames, | 1759       "subtestNames": subtestNames, | 
| 1760       "isolateStubs": isolateStubs, | 1760       "isolateStubs": isolateStubs, | 
| 1761       "containsDomImport": containsDomImport | 1761       "containsDomImport": containsDomImport | 
| 1762     }; | 1762     }; | 
| 1763   } | 1763   } | 
| 1764 | 1764 | 
| 1765   List<List<String>> getVmOptions(Map optionsFromFile) { | 1765   List<List<String>> getVmOptions(Map optionsFromFile) { | 
| 1766     var COMPILERS = const ['none', 'precompiler', 'dart2app']; | 1766     var COMPILERS = const ['none', 'precompiler', 'dart2app', 'dart2appjit']; | 
| 1767     var RUNTIMES = const [ | 1767     var RUNTIMES = const [ | 
| 1768       'none', | 1768       'none', | 
| 1769       'dart_precompiled', | 1769       'dart_precompiled', | 
| 1770       'dart_product', | 1770       'dart_app', | 
| 1771       'vm', | 1771       'vm', | 
| 1772       'drt', | 1772       'drt', | 
| 1773       'dartium', | 1773       'dartium', | 
| 1774       'ContentShellOnAndroid', | 1774       'ContentShellOnAndroid', | 
| 1775       'DartiumOnAndroid' | 1775       'DartiumOnAndroid' | 
| 1776     ]; | 1776     ]; | 
| 1777     var needsVmOptions = COMPILERS.contains(configuration['compiler']) && | 1777     var needsVmOptions = COMPILERS.contains(configuration['compiler']) && | 
| 1778         RUNTIMES.contains(configuration['runtime']); | 1778         RUNTIMES.contains(configuration['runtime']); | 
| 1779     if (!needsVmOptions) return [[]]; | 1779     if (!needsVmOptions) return [[]]; | 
| 1780     final vmOptions = optionsFromFile['vmOptions']; | 1780     final vmOptions = optionsFromFile['vmOptions']; | 
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2176               'This path might be too long'); | 2176               'This path might be too long'); | 
| 2177         } | 2177         } | 
| 2178       }); | 2178       }); | 
| 2179     } else { | 2179     } else { | 
| 2180       var dir = new Directory(path); | 2180       var dir = new Directory(path); | 
| 2181       return dir.delete(recursive: true); | 2181       return dir.delete(recursive: true); | 
| 2182     } | 2182     } | 
| 2183   } | 2183   } | 
| 2184 | 2184 | 
| 2185   static deleteTempSnapshotDirectory(Map configuration) { | 2185   static deleteTempSnapshotDirectory(Map configuration) { | 
| 2186     if (configuration['compiler'] == 'dart2app') { | 2186     if (configuration['compiler'] == 'dart2app' || | 
|  | 2187         configuration['compiler'] == 'dart2appjit' || | 
|  | 2188         configuration['compiler'] == 'precompiler') { | 
| 2187       var checked = configuration['checked'] ? '-checked' : ''; | 2189       var checked = configuration['checked'] ? '-checked' : ''; | 
| 2188       var minified = configuration['minified'] ? '-minified' : ''; | 2190       var minified = configuration['minified'] ? '-minified' : ''; | 
| 2189       var csp = configuration['csp'] ? '-csp' : ''; | 2191       var csp = configuration['csp'] ? '-csp' : ''; | 
| 2190       var sdk = configuration['use_sdk'] ? '-sdk' : ''; | 2192       var sdk = configuration['use_sdk'] ? '-sdk' : ''; | 
| 2191       var packages = | 2193       var packages = | 
| 2192           configuration['use_public_packages'] ? '-public_packages' : ''; | 2194           configuration['use_public_packages'] ? '-public_packages' : ''; | 
| 2193       var dirName = "${configuration['compiler']}" | 2195       var dirName = "${configuration['compiler']}" | 
| 2194           "$checked$minified$csp$packages$sdk"; | 2196           "$checked$minified$csp$packages$sdk"; | 
| 2195       String generatedPath = "${TestUtils.buildDir(configuration)}" | 2197       String generatedPath = "${TestUtils.buildDir(configuration)}" | 
| 2196           "/generated_compilations/$dirName"; | 2198           "/generated_compilations/$dirName"; | 
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2452       for (var key in PATH_REPLACEMENTS.keys) { | 2454       for (var key in PATH_REPLACEMENTS.keys) { | 
| 2453         if (path.startsWith(key)) { | 2455         if (path.startsWith(key)) { | 
| 2454           path = path.replaceFirst(key, PATH_REPLACEMENTS[key]); | 2456           path = path.replaceFirst(key, PATH_REPLACEMENTS[key]); | 
| 2455           break; | 2457           break; | 
| 2456         } | 2458         } | 
| 2457       } | 2459       } | 
| 2458     } | 2460     } | 
| 2459     return path; | 2461     return path; | 
| 2460   } | 2462   } | 
| 2461 } | 2463 } | 
| OLD | NEW | 
|---|