Index: pkg/analyzer/benchmark/errors_in_all_libraries.dart |
diff --git a/pkg/analyzer/benchmark/errors_in_all_libraries.dart b/pkg/analyzer/benchmark/errors_in_all_libraries.dart |
index 6f02534b7e2a82d7902a7438a1ea7ca842d9b10c..da419d9b82c988aa2cb6892681d36974cf9f55c6 100644 |
--- a/pkg/analyzer/benchmark/errors_in_all_libraries.dart |
+++ b/pkg/analyzer/benchmark/errors_in_all_libraries.dart |
@@ -10,21 +10,17 @@ |
import 'dart:io'; |
import 'package:analyzer/dart/element/element.dart'; |
+import 'package:analyzer/file_system/file_system.dart'; |
+import 'package:analyzer/file_system/physical_file_system.dart'; |
+import 'package:analyzer/src/dart/sdk/sdk.dart'; |
import 'package:analyzer/src/generated/engine.dart'; |
import 'package:analyzer/src/generated/java_io.dart'; |
-import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk; |
+import 'package:analyzer/src/generated/sdk.dart'; |
import 'package:analyzer/src/generated/source.dart'; |
import 'package:analyzer/src/generated/source_io.dart'; |
-import 'package:analyzer/file_system/file_system.dart'; |
-import 'package:analyzer/file_system/physical_file_system.dart'; |
import 'package:path/path.dart' as p; |
void main(List<String> args) { |
- JavaSystemIO.setProperty( |
- "com.google.dart.sdk", |
- p.normalize( |
- p.join(p.dirname(p.fromUri(Platform.script)), "../../../sdk"))); |
- |
// Assumes you have run "pub get" in the analyzer directory itself and uses |
// that "packages" directory as its package root. |
var packageRoot = |
@@ -35,10 +31,14 @@ void main(List<String> args) { |
var start = new DateTime.now(); |
AnalysisEngine.instance.clearCaches(); |
- var context = AnalysisEngine.instance.createAnalysisContext(); |
+ PhysicalResourceProvider resourceProvider = |
+ PhysicalResourceProvider.INSTANCE; |
+ DartSdk sdk = new FolderBasedDartSdk( |
+ resourceProvider, resourceProvider.getFolder(args[0])); |
+ AnalysisContext context = AnalysisEngine.instance.createAnalysisContext(); |
context.sourceFactory = new SourceFactory([ |
- new DartUriResolver(DirectoryBasedDartSdk.defaultSdk), |
- new ResourceUriResolver(PhysicalResourceProvider.INSTANCE), |
+ new DartUriResolver(sdk), |
+ new ResourceUriResolver(resourceProvider), |
new PackageUriResolver([new JavaFile(packageRoot)]) |
]); |
@@ -86,6 +86,7 @@ List<LibraryElement> _reachableLibraries(LibraryElement start) { |
lib.importedLibraries.forEach(find); |
lib.exportedLibraries.forEach(find); |
} |
+ |
find(start); |
return results; |
} |