commit 38340760c4661db4c0a2de8908e7164089c82cbf
author Paul Berry <stereotype441@gmail.com> Mon Sep 26 11:26:48 2016 -0700
committer GitHub <noreply@github.com> Mon Sep 26 11:26:48 2016 -0700
tree 38354abbf0a80023f4742baefdb9e5b6ec932c03
parent 8726cd3998744e033abfaf9411d4888f4882274e

Update cli_util.dart

lib/cli_util.dart

diff --git a/lib/cli_util.dart b/lib/cli_util.dart
index aff2c67..6533e9f 100644
--- a/lib/cli_util.dart
+++ b/lib/cli_util.dart
@@ -33,7 +33,14 @@
   }
 
   // Look relative to the dart executable.
-  Directory sdkDirectory = new File(Platform.executable).parent.parent;
+  File platformExecutable = new File(Platform.executable);
+  Directory sdkDirectory = platformExecutable.parent.parent;
+  if (_isSdkDir(sdkDirectory)) return sdkDirectory;
+
+  // Handle the case where Platform.executable is a sibling of the SDK directory
+  // (this happens during internal testing).
+  sdkDirectory =
+      new Directory(p.join(platformExecutable.parent.path, 'dart-sdk'));
   if (_isSdkDir(sdkDirectory)) return sdkDirectory;
 
   // Try and locate the VM using 'which'.