Get rid of support for string interpolation in #import strings.

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 261 matching lines @@
 
 
 static Dart_NativeFunction NativeResolver(Dart_Handle name,
                                           int arg_count) {
   return &func;
 }
 
 
 BENCHMARK(Dart2JSCompileAll) {
   char* dart_root = ComputeDart2JSPath(Benchmark::Executable());
-  Dart_Handle import_map;
+  char* script = NULL;
   if (dart_root != NULL) {
-    import_map = Dart_NewList(2);
-    Dart_ListSetAt(import_map, 0, Dart_NewString("DART_ROOT"));
-    Dart_ListSetAt(import_map, 1, Dart_NewString(dart_root));
+    const char* kFormatStr ="#import('%s/lib/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 {
-    import_map = Dart_NewList(0);
+    Dart_Handle lib = TestCase::LoadTestScript(
+        "#import('lib/compiler/compiler.dart');",
+        reinterpret_cast<Dart_NativeEntryResolver>(NativeResolver));
+    EXPECT_VALID(lib);
   }
-  const char* kScriptChars =
-      "#import('${DART_ROOT}/lib/compiler/compiler.dart');";
-  Dart_Handle lib = TestCase::LoadTestScript(
-      kScriptChars,
-      reinterpret_cast<Dart_NativeEntryResolver>(NativeResolver),
-      import_map);
-  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);
   free(dart_root);
+  free(script);
 }
 
 
 //
 // Measure frame lookup during stack traversal.
 //
 static void StackFrame_accessFrame(Dart_NativeArguments args) {
   const int kNumIterations = 100;
   Dart_EnterScope();
   Code& code = Code::Handle();
@@ skipping 72 matching lines @@
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("StackFrameTest"));
   Dart_Handle result = Dart_Invoke(cls, Dart_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