Changes outside pkg/ and lib/ for directory refactoring

runtime/vm/benchmark_test.cc

 // Copyright (c) 2012, 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.
 
 #include "vm/benchmark_test.h"
 
 #include "bin/file.h"
 
 #include "platform/assert.h"
 
@@ skipping 215 matching lines @@
   benchmark->set_score(elapsed_time);
 }
 
 
 //
 // Measure compile of all dart2js(compiler) functions.
 //
 static char* ComputeDart2JSPath(const char* arg) {
   char buffer[2048];
   char* dart2js_path = strdup(File::GetCanonicalPath(arg));
-  const char* compiler_path = "%s%slib%scompiler%scompiler.dart";
+  const char* compiler_path =
+      "%s%ssdk%slib%siinternal%scompiler%scompiler.dart";
   const char* path_separator = File::PathSeparator();
   ASSERT(path_separator != NULL && strlen(path_separator) == 1);
   char* ptr = strrchr(dart2js_path, *path_separator);
   while (ptr != NULL) {
     *ptr = '\0';
     OS::SNPrint(buffer, 2048, compiler_path,
                 dart2js_path,
                 path_separator,
                 path_separator,
                 path_separator);
@@ skipping 17 matching lines @@
 static Dart_NativeFunction NativeResolver(Dart_Handle name,
                                           int arg_count) {
   return &func;
 }
 
 
 BENCHMARK(Dart2JSCompileAll) {
   char* dart_root = ComputeDart2JSPath(Benchmark::Executable());
   char* script = NULL;
   if (dart_root != NULL) {
-    const char* kFormatStr ="#import('%s/lib/compiler/compiler.dart');";
+    const char* kFormatStr =
+        "#import('%s/sdk/lib/_internal/compiler/compiler.dart');";
     intptr_t len = OS::SNPrint(NULL, 0, kFormatStr, dart_root) + 1;
     script = reinterpret_cast<char*>(malloc(len));
     EXPECT(script != NULL);
     OS::SNPrint(script, len, kFormatStr, dart_root);
     Dart_Handle lib = TestCase::LoadTestScript(
         script,
         reinterpret_cast<Dart_NativeEntryResolver>(NativeResolver));
     EXPECT_VALID(lib);
   } else {
     Dart_Handle lib = TestCase::LoadTestScript(
-        "#import('lib/compiler/compiler.dart');",
+        "#import('sdk/lib/_internal/compiler/compiler.dart');",
         reinterpret_cast<Dart_NativeEntryResolver>(NativeResolver));
     EXPECT_VALID(lib);
   }
   Timer timer(true, "Compile all of dart2js benchmark");
   timer.Start();
   Dart_Handle result = Dart_CompileAll();
   EXPECT_VALID(result);
   timer.Stop();
   int64_t elapsed_time = timer.TotalElapsedTime();
   benchmark->set_score(elapsed_time);
@@ skipping 84 matching lines @@
   Dart_Handle cls = Dart_GetClass(lib, NewString("StackFrameTest"));
   Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
   EXPECT_VALID(result);
   int64_t elapsed_time = 0;
   result = Dart_IntegerToInt64(result, &elapsed_time);
   EXPECT_VALID(result);
   benchmark->set_score(elapsed_time);
 }
 
 }  // namespace dart