commit a989bac685315361d8e36764b365023406b545c3
author Alexander Aprelev <aam@google.com> Fri May 04 15:21:08 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Fri May 04 15:21:08 2018 +0000
tree 97edb259a3220c0f98b12f227976cb26c8556883
parent 543d8775e31a6ff377595f74b010c3c0f94d5a4b

[frontend-server] Re-enable depfile test on Windows.

Split by ': ' and change test so it ignores difference in the path that gets escaped for ninja on Windows.

Bug: https://github.com/dart-lang/sdk/issues/33032
Change-Id: Iceeddba1a9c2d94a74c1f08d52144d2eb030f703
Reviewed-on: https://dart-review.googlesource.com/53681
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 fb1c877..7ea07d4 100644
--- a/pkg/vm/test/frontend_server_test.dart
+++ b/pkg/vm/test/frontend_server_test.dart
@@ -7,6 +7,7 @@
 import 'package:kernel/binary/ast_to_binary.dart';
 import 'package:kernel/ast.dart' show Component;
 import 'package:mockito/mockito.dart';
+import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:vm/incremental_compiler.dart';
 
@@ -462,7 +463,7 @@
     Directory tempDir;
     setUp(() {
       var systemTempDir = Directory.systemTemp;
-      tempDir = systemTempDir.createTempSync('foo');
+      tempDir = systemTempDir.createTempSync('foo bar');
     });
 
     tearDown(() {
@@ -656,15 +657,11 @@
     });
 
     test('compile and produce deps file', () async {
-      if (Platform.isWindows) {
-        // TODO(dartbug.com/33032): Fix depfile generation on Windows.
-        return;
-      }
       var file = new File('${tempDir.path}/foo.dart')..createSync();
       file.writeAsStringSync("main() {}\n");
       var dillFile = new File('${tempDir.path}/app.dill');
       expect(dillFile.existsSync(), equals(false));
-      var depFile = new File('${tempDir.path}/depfile');
+      var depFile = new File('${tempDir.path}/the depfile');
       expect(depFile.existsSync(), equals(false));
       final List<String> args = <String>[
         '--sdk-root=${sdkRoot.toFilePath()}',
@@ -679,8 +676,8 @@
 
       expect(depFile.existsSync(), true);
       var depContents = depFile.readAsStringSync();
-      var depContentsParsed = depContents.split(':');
-      expect(depContentsParsed[0], dillFile.path);
+      var depContentsParsed = depContents.split(': ');
+      expect(path.basename(depContentsParsed[0]), path.basename(dillFile.path));
       expect(depContentsParsed[1], isNotEmpty);
     });
   });