languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 15:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix analyzer's SDK detection so that during integration tests, we use the built SDK.

Browse source 
R=scheglov@google.com

Review-Url: https://codereview.chromium.org/2568743003 .
This commit is contained in:
Paul Berry 2016-12-12 09:49:50 -08:00
parent a7222ac09d
commit fb2dbfce21
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkg/analyzer/lib/src/dart/sdk/sdk.dart
View file

@ -698,7 +698,16 @@ class FolderBasedDartSdk extends AbstractDartSdk {
String outDir = pathContext.dirname(pathContext.dirname(exec));
String sdkPath = pathContext.join(pathContext.dirname(outDir), "sdk");
if (resourceProvider.getFolder(sdkPath).exists) {
return sdkPath;
// We are executing in the context of a test. sdkPath is the path to the
// *source* files for the SDK. But we want to test using the path to the
// *built* SDK if possible.
String builtSdkPath =
pathContext.join(pathContext.dirname(exec), 'dart-sdk');
if (resourceProvider.getFolder(sdkPath).exists) {
return builtSdkPath;
} else {
return sdkPath;
}
}
// probably be "dart-sdk/bin/dart"
return pathContext.dirname(pathContext.dirname(exec));