Index: tools/testing/dart/test_suite.dart |
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
index 69f077f8a79ffc0ae0ddac995cc873023e3e7893..e994822dde214285f4d0b194fb41c7eafd4ef6a5 100644 |
--- a/tools/testing/dart/test_suite.dart |
+++ b/tools/testing/dart/test_suite.dart |
@@ -717,7 +717,8 @@ class StandardTestSuite extends TestSuite { |
'$directory/$name.status', |
'$directory/.status', |
'$directory/${name}_dart2js.status', |
- '$directory/${name}_analyzer2.status' |
+ '$directory/${name}_analyzer2.status', |
+ '$directory/${name}_kernel.status' |
]; |
return new StandardTestSuite(configuration, name, directory, status_paths, |
@@ -1675,7 +1676,9 @@ class StandardTestSuite extends TestSuite { |
* configurations, so it may not use [configuration]. |
*/ |
Map readOptionsFromFile(Path filePath) { |
- if (filePath.segments().contains('co19')) { |
+ if (filePath.filename.endsWith('.dill')) { |
+ return optionsFromKernelFile(); |
+ } else if (filePath.segments().contains('co19')) { |
return readOptionsFromCo19File(filePath); |
} |
RegExp testOptionsRegExp = new RegExp(r"// VMOptions=(.*)"); |
@@ -1801,6 +1804,25 @@ class StandardTestSuite extends TestSuite { |
}; |
} |
+ Map optionsFromKernelFile() { |
+ return const { |
+ "vmOptions": const [ const []], |
+ "sharedOptions": const [], |
+ "dartOptions": null, |
+ "packageRoot": null, |
+ "packages": null, |
+ "hasCompileError": false, |
+ "hasRuntimeError": false, |
+ "hasStaticWarning": false, |
+ "otherScripts": const [], |
+ "isMultitest": false, |
+ "isMultiHtmlTest": false, |
+ "subtestNames": const [], |
+ "isolateStubs": '', |
+ "containsDomImport": false, |
+ }; |
+ } |
+ |
List<List<String>> getVmOptions(Map optionsFromFile) { |
var COMPILERS = const ['none', 'precompiler', 'dart2app', 'dart2appjit']; |
var RUNTIMES = const [ |