| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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_helper; | 5 library test_helper; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:convert'; | 8 import 'dart:convert'; |
| 9 import 'dart:io'; | 9 import 'dart:io'; |
| 10 import 'package:observatory/service_io.dart'; | 10 import 'package:observatory/service_io.dart'; |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 } | 151 } |
| 152 fullArgs.addAll(args); | 152 fullArgs.addAll(args); |
| 153 | 153 |
| 154 return _spawnCommon(dartExecutable, fullArgs); | 154 return _spawnCommon(dartExecutable, fullArgs); |
| 155 } | 155 } |
| 156 | 156 |
| 157 Future<Process> _spawnSkyProcess(bool pause_on_start, | 157 Future<Process> _spawnSkyProcess(bool pause_on_start, |
| 158 bool pause_on_exit, | 158 bool pause_on_exit, |
| 159 bool pause_on_unhandled_exceptions, | 159 bool pause_on_unhandled_exceptions, |
| 160 bool trace_service, | 160 bool trace_service, |
| 161 bool trace_compiler) { | 161 bool trace_compiler, |
| 162 bool testeeControlsServer) { |
| 162 assert(_shouldLaunchSkyShell()); | 163 assert(_shouldLaunchSkyShell()); |
| 163 | 164 |
| 164 String dartExecutable = _skyShellPath(); | 165 String dartExecutable = _skyShellPath(); |
| 165 | 166 |
| 166 var dartFlags = []; | 167 var dartFlags = []; |
| 167 var fullArgs = []; | 168 var fullArgs = []; |
| 168 if (trace_service) { | 169 if (trace_service) { |
| 169 dartFlags.add('--trace_service'); | 170 dartFlags.add('--trace_service'); |
| 170 dartFlags.add('--trace_service_verbose'); | 171 dartFlags.add('--trace_service_verbose'); |
| 171 } | 172 } |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 mainArgs: mainArgs, | 432 mainArgs: mainArgs, |
| 432 vmTests: tests, | 433 vmTests: tests, |
| 433 pause_on_start: pause_on_start, | 434 pause_on_start: pause_on_start, |
| 434 pause_on_exit: pause_on_exit, | 435 pause_on_exit: pause_on_exit, |
| 435 trace_service: trace_service, | 436 trace_service: trace_service, |
| 436 trace_compiler: trace_compiler, | 437 trace_compiler: trace_compiler, |
| 437 verbose_vm: verbose_vm, | 438 verbose_vm: verbose_vm, |
| 438 pause_on_unhandled_exceptions: pause_on_unhandled_exceptions); | 439 pause_on_unhandled_exceptions: pause_on_unhandled_exceptions); |
| 439 } | 440 } |
| 440 } | 441 } |
| OLD | NEW |