Correctly set root_library based on the application script URI instead of looking for the library t…

runtime/vm/unit_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/unit_test.h"
 
 #include <stdio.h>
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 71 matching lines @@
   return (strncmp(url_name, kPackageScheme, kPackageSchemeLen) == 0);
 }
 
 struct TestLibEntry {
   const char* url;
   const char* source;
 };
 
 static MallocGrowableArray<TestLibEntry>* test_libs_ = NULL;
 
+const char* TestCase::url() {
+  return (FLAG_use_dart_frontend) ? RESOLVED_USER_TEST_URI : USER_TEST_URI;
+}
+
 void TestCase::AddTestLib(const char* url, const char* source) {
   if (test_libs_ == NULL) {
     test_libs_ = new MallocGrowableArray<TestLibEntry>();
   }
   // If the test lib is already added, replace the source.
   for (intptr_t i = 0; i < test_libs_->length(); i++) {
     if (strcmp(url, (*test_libs_)[i].url) == 0) {
       (*test_libs_)[i].source = source;
       return;
     }
@@ skipping 46 matching lines @@
   const int kNumArgs = 1;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = DartUtils::NewString(uri_chars);
   return Dart_Invoke(DartUtils::BuiltinLib(),
                      DartUtils::NewString("_filePathFromUri"), kNumArgs,
                      dart_args);
 }
 
 static ThreadLocalKey script_reload_key = kUnsetThreadLocalKey;
 
-static char* CompileTestScriptWithDFE(const char* url,
-                                      const char* source,
-                                      void** kernel_pgm) {
+char* TestCase::CompileTestScriptWithDFE(const char* url,
+                                         const char* source,
+                                         void** kernel_pgm) {
   Zone* zone = Thread::Current()->zone();
-  char* filename = OS::SCreate(zone, "file:///%s", url);
   // clang-format off
   Dart_SourceFile sourcefiles[] = {
     {
-      filename, source,
+      url, source,
     },
     {
       "file:///.packages", "untitled:/"
     }};
   // clang-format on
   int sourcefiles_count = sizeof(sourcefiles) / sizeof(Dart_SourceFile);
   Dart_KernelCompilationResult compilation_result =
-      Dart_CompileSourcesToKernel(filename, sourcefiles_count, sourcefiles);
+      Dart_CompileSourcesToKernel(url, sourcefiles_count, sourcefiles);
 
   if (compilation_result.status != Dart_KernelCompilationStatus_Ok) {
     return OS::SCreate(zone, "Compilation failed %s", compilation_result.error);
   }
   const uint8_t* kernel_file = compilation_result.kernel;
   intptr_t kernel_length = compilation_result.kernel_size;
   if (kernel_file == NULL) {
     return OS::SCreate(zone, "front end generated a NULL kernel file");
   }
   *kernel_pgm = Dart_ReadKernelBinary(kernel_file, kernel_length);
@@ skipping 12 matching lines @@
     const char* script_source = reinterpret_cast<const char*>(
         OSThread::GetThreadLocal(script_reload_key));
     ASSERT(script_source != NULL);
     OSThread::SetThreadLocal(script_reload_key, 0);
     const char* urlstr = NULL;
     Dart_Handle result = Dart_StringToCString(url, &urlstr);
     if (Dart_IsError(result)) {
       return Dart_NewApiError("accessing url characters failed");
     }
     void* kernel_pgm;
-    char* error = CompileTestScriptWithDFE(urlstr, script_source, &kernel_pgm);
+    char* error =
+        TestCase::CompileTestScriptWithDFE(urlstr, script_source, &kernel_pgm);
     if (error == NULL) {
-      return Dart_LoadKernel(kernel_pgm);
+      return Dart_LoadScript(url, Dart_Null(),
+                             reinterpret_cast<Dart_Handle>(kernel_pgm), 0, 0);
     } else {
       return Dart_NewApiError(error);
     }
   }
   if (tag == Dart_kCanonicalizeUrl) {
     Dart_Handle library_url = Dart_LibraryUrl(library);
     if (Dart_IsError(library_url)) {
       return library_url;
     }
     return Dart_DefaultCanonicalizeUrl(library_url, url);
@@ skipping 94 matching lines @@
     result = Dart_FinalizeLoading(false);
     DART_CHECK_VALID(result);
   }
   return lib;
 }
 
 static Dart_Handle LoadTestScriptWithDFE(const char* script,
                                          Dart_NativeEntryResolver resolver,
                                          const char* lib_url,
                                          bool finalize_classes) {
+  Dart_Handle url = NewString(lib_url);
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   EXPECT_VALID(result);
   void* kernel_pgm = NULL;
-  char* error = CompileTestScriptWithDFE(lib_url, script, &kernel_pgm);
+  char* error =
+      TestCase::CompileTestScriptWithDFE(lib_url, script, &kernel_pgm);
   if (error == NULL) {
-    Dart_Handle lib = Dart_LoadKernel(kernel_pgm);
+    Dart_Handle lib = Dart_LoadScript(
+        url, Dart_Null(), reinterpret_cast<Dart_Handle>(kernel_pgm), 0, 0);
     DART_CHECK_VALID(lib);
     result = Dart_SetNativeResolver(lib, resolver, NULL);
     DART_CHECK_VALID(result);
     if (finalize_classes) {
       result = Dart_FinalizeLoading(false);
       DART_CHECK_VALID(result);
     }
     return lib;
   } else {
     return Dart_NewApiError(error);
   }
 }
 
 Dart_Handle TestCase::LoadTestScript(const char* script,
                                      Dart_NativeEntryResolver resolver,
                                      const char* lib_url,
                                      bool finalize_classes) {
   if (!FLAG_use_dart_frontend) {
     return LoadTestScriptWithVMParser(script, resolver, lib_url,
                                       finalize_classes);
   } else {
-    return LoadTestScriptWithDFE(script, resolver, lib_url, finalize_classes);
+    Zone* zone = Thread::Current()->zone();
+    char* resolved_lib_url = OS::SCreate(zone, "file:///%s", lib_url);
+    return LoadTestScriptWithDFE(script, resolver, resolved_lib_url,
+                                 finalize_classes);
   }
 }
 
 #ifndef PRODUCT
 
 void TestCase::SetReloadTestScript(const char* script) {
   if (script_reload_key == kUnsetThreadLocalKey) {
     script_reload_key = OSThread::CreateThreadLocal();
   }
   ASSERT(script_reload_key != kUnsetThreadLocalKey);
@@ skipping 187 matching lines @@
     pos = strstr(in, prefix);
   }
   // Copy the remainder of in to out.
   while (*in != '\0') {
     *out++ = *in++;
   }
   *out = '\0';
 }
 
 }  // namespace dart