| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.integration.analysis; | 5 library test.integration.analysis; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:collection'; | 8 import 'dart:collection'; |
| 9 import 'dart:convert'; | 9 import 'dart:convert'; |
| 10 import 'dart:io'; | 10 import 'dart:io'; |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 } | 501 } |
| 502 | 502 |
| 503 /** | 503 /** |
| 504 * Start the server. If [debugServer] is true, the server will be started | 504 * Start the server. If [debugServer] is true, the server will be started |
| 505 * with "--debug", allowing a debugger to be attached. | 505 * with "--debug", allowing a debugger to be attached. |
| 506 */ | 506 */ |
| 507 static Future<Server> start({bool debugServer: false}) { | 507 static Future<Server> start({bool debugServer: false}) { |
| 508 // TODO(paulberry): move the logic for finding the script, the dart | 508 // TODO(paulberry): move the logic for finding the script, the dart |
| 509 // executable, and the package root into a shell script. | 509 // executable, and the package root into a shell script. |
| 510 String dartBinary = Platform.executable; | 510 String dartBinary = Platform.executable; |
| 511 String scriptDir = dirname(Platform.script.path); | 511 String scriptDir = dirname(Platform.script.toFilePath(windows: |
| 512 Platform.isWindows)); |
| 512 String serverPath = normalize(join(scriptDir, '..', '..', 'bin', | 513 String serverPath = normalize(join(scriptDir, '..', '..', 'bin', |
| 513 'server.dart')); | 514 'server.dart')); |
| 514 List<String> arguments = []; | 515 List<String> arguments = []; |
| 515 if (debugServer) { | 516 if (debugServer) { |
| 516 arguments.add('--debug'); | 517 arguments.add('--debug'); |
| 517 } | 518 } |
| 518 arguments.add('--package-root=${Platform.packageRoot}'); | 519 arguments.add('--package-root=${Platform.packageRoot}'); |
| 519 arguments.add(serverPath); | 520 arguments.add(serverPath); |
| 520 return Process.start(dartBinary, arguments).then((Process process) { | 521 return Process.start(dartBinary, arguments).then((Process process) { |
| 521 Server server = new Server._(process); | 522 Server server = new Server._(process); |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 * Record a message that was exchanged with the server, and print it out if | 651 * Record a message that was exchanged with the server, and print it out if |
| 651 * [debugStdio] has been called. | 652 * [debugStdio] has been called. |
| 652 */ | 653 */ |
| 653 void _recordStdio(String line) { | 654 void _recordStdio(String line) { |
| 654 if (_debuggingStdio) { | 655 if (_debuggingStdio) { |
| 655 print(line); | 656 print(line); |
| 656 } | 657 } |
| 657 _recordedStdio.add(line); | 658 _recordedStdio.add(line); |
| 658 } | 659 } |
| 659 } | 660 } |
| OLD | NEW |