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

pkg/analyzer/lib/src/dart/sdk/sdk.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.generated.sdk2;
 
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io' as io;
 
@@ skipping 680 matching lines @@
         exec = exec.substring(2);
       } else if (resourceProvider is MemoryResourceProvider) {
         exec = resourceProvider.convertPath(exec);
       }
       exec = pathContext.fromUri(pathos.context.toUri(exec));
     }
     // Might be "xcodebuild/ReleaseIA32/dart" with "sdk" sibling
     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) {

[zra, 2016/12/12 19:16:17]

Shouldn't this be checking the existence of buildSdkPath rather than sdkPath?
This is probably what is causing the build failure.

[Paul Berry, 2016/12/12 19:24:39]

Yes, I just noticed this as well.  Thanks.

[Paul Berry, 2016/12/12 19:27:50]

Fix is here: https://codereview.chromium.org/2568253002/

+        return builtSdkPath;
+      } else {
+        return sdkPath;
+      }
     }
     // probably be "dart-sdk/bin/dart"
     return pathContext.dirname(pathContext.dirname(exec));
   }
 }
 
 /**
  * An object used to locate SDK extensions.
  *
  * Given a package map, it will check in each package's `lib` directory for the
@@ skipping 171 matching lines @@
     SdkLibrariesReader_LibraryBuilder libraryBuilder =
         new SdkLibrariesReader_LibraryBuilder(_useDart2jsPaths);
     // If any syntactic errors were found then don't try to visit the AST
     // structure.
     if (!errorListener.errorReported) {
       unit.accept(libraryBuilder);
     }
     return libraryBuilder.librariesMap;
   }
 }