[dartdevc] fix lib name for ddb kernel

vsmenon · commit-bot@chromium.org · commit 7e486efea268 · 2019-08-08T17:03:51.000Z
This appears related to recent kernel lib name changes. I hit this if I run: > ddb -k tests/language_2/some_test.dart Looks like the lib name is now "tests__language_2__some_test". Change-Id: I20a19c5542276df7321b0b4ea6284142fbcfd5d2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112360 Commit-Queue: Vijay Menon <vsm@google.com> Reviewed-by: Mark Zhou <markzipan@google.com>
diff --git a/pkg/dev_compiler/tool/ddb b/pkg/dev_compiler/tool/ddb
@@ -66,10 +66,6 @@ void main(List<String> args) async {
     printUsage();
     exit(1);
   }
-  var entry = p.canonicalize(options.rest.first);
-  var libRoot = p.dirname(entry);
-  var basename = p.basenameWithoutExtension(entry);
-
   var debug = options['debug'] as bool;
   var kernel = options['kernel'] as bool;
   var summarizeText = options['summarize-text'] as bool;
@@ -78,6 +74,14 @@ void main(List<String> args) async {
   var summaries = options['summary'] as List;
   var port = int.parse(options['port'] as String);
 
+  var entry = p.canonicalize(options.rest.first);
+  var libRoot = p.dirname(entry);
+  var basename = p.basenameWithoutExtension(entry);
+  var libname = kernel
+      ? p.relative(p.withoutExtension(entry)).replaceAll('/', '__')
+      : basename;
+  libname = libname.replaceAll('-', '_');
+
   // By default (no `-d`), we use the `dartdevc` binary on the user's path to
   // compute the SDK we use for execution.  I.e., we assume that `dart` is
   // under `$DART_SDK/bin/dart` and use that to find `dartdevc` and related
@@ -200,7 +204,7 @@ void main(List<String> args) async {
         function(sdk, app) {
     'use strict';
     sdk._debugger.registerDevtoolsFormatter();
-    app.$basename.main();
+    app.$libname.main();
   });
 </script>
 """;
@@ -225,7 +229,7 @@ void main(List<String> args) async {
     } catch(e) {
     }
     let sdk = require(\"dart_sdk\");
-    let main = require(\"./$basename\").$basename.main;
+    let main = require(\"./$basename\").$libname.main;
     try {
       sdk._isolate_helper.startRootIsolate(main, []);
     } catch(e) {
@@ -255,7 +259,7 @@ void main(List<String> args) async {
     var runjs = '''
     import { dart, _isolate_helper } from '$sdkJsPath/dart_sdk.js';
     import { $basename } from '$basename.js';
-    let main = $basename.main;
+    let main = $libname.main;
     try {
       _isolate_helper.startRootIsolate(() => {}, []);
       main();
