commit 2c7e6df9d36a37bce07f1cfd6b7178f633686c89
author Alexander Aprelev <aam@google.com> Tue Aug 14 20:21:21 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Tue Aug 14 20:21:21 2018 +0000
tree 225096ab4fde9c7d29814db02e055d13aeaa46f3
parent 4b704f234e2a3a149116cf52237077e7105e94dd

[frontend-server] Fix frontend-server test on Windows.

Change-Id: Ib659b28555f2be0f05decdc7be41c6982e2d4804
Reviewed-on: https://dart-review.googlesource.com/70023
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>

pkg/vm/test/frontend_server_test.dart

diff --git a/pkg/vm/test/frontend_server_test.dart b/pkg/vm/test/frontend_server_test.dart
index 94d5c69..75c22d1 100644
--- a/pkg/vm/test/frontend_server_test.dart
+++ b/pkg/vm/test/frontend_server_test.dart
@@ -800,7 +800,7 @@
         '--sdk-root=${sdkRoot.toFilePath()}',
         '--strong',
         '--incremental',
-        '--platform=${platformKernel.path}',
+        '--platform=$platformKernel',
         '--output-dill=${dillFile.path}',
         '--output-incremental-dill=${incrementalDillFile.path}'
       ];
@@ -875,7 +875,8 @@
             }
 
             // Include platform and verify.
-            component = loadComponentFromBinary(platformKernel.path, component);
+            component =
+                loadComponentFromBinary(platformKernel.toFilePath(), component);
             expect(component.mainMethod, isNotNull);
             verifyComponent(component);
 
@@ -900,7 +901,8 @@
                 reason: "Expect the same number of sources after a reset.");
 
             // Include platform and verify.
-            component = loadComponentFromBinary(platformKernel.path, component);
+            component =
+                loadComponentFromBinary(platformKernel.toFilePath(), component);
             expect(component.mainMethod, isNotNull);
             verifyComponent(component);
 
@@ -925,10 +927,11 @@
 
             // Reload with 1 change
             inputStreamController.add('accept\n'.codeUnits);
-            inputStreamController.add('recompile ${dart2js.path} x$count\n'
-                '${dart2jsOtherFile.path}\n'
-                'x$count\n'
-                .codeUnits);
+            inputStreamController
+                .add('recompile ${dart2jsOtherFile.path} x$count\n'
+                    '${dart2jsOtherFile.uri}\n'
+                    'x$count\n'
+                    .codeUnits);
           } else if (count == 3) {
             // Partial file. Expect to not be empty.
             expect(incrementalDillFile.existsSync(), equals(true));