| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 void requestExit() { | 274 void requestExit() { |
| 275 print('** Killing script'); | 275 print('** Killing script'); |
| 276 if (process.kill()) { | 276 if (process.kill()) { |
| 277 killedByTester = true; | 277 killedByTester = true; |
| 278 } | 278 } |
| 279 } | 279 } |
| 280 } | 280 } |
| 281 | 281 |
| 282 void setupAddresses(Uri serverAddress) { | 282 void setupAddresses(Uri serverAddress) { |
| 283 serviceWebsocketAddress = | 283 serviceWebsocketAddress = |
| 284 'ws://${serverAddress.authority}${serverAddress.path}ws'; | 284 'ws://${serverAddress.authority}${serverAddress.path}/ws'; |
| 285 serviceHttpAddress = | 285 serviceHttpAddress = |
| 286 'http://${serverAddress.authority}${serverAddress.path}'; | 286 'http://${serverAddress.authority}${serverAddress.path}'; |
| 287 } | 287 } |
| 288 | 288 |
| 289 class _ServiceTesterRunner { | 289 class _ServiceTesterRunner { |
| 290 void run({List<String> mainArgs, | 290 void run({List<String> mainArgs, |
| 291 List<VMTest> vmTests, | 291 List<VMTest> vmTests, |
| 292 List<IsolateTest> isolateTests, | 292 List<IsolateTest> isolateTests, |
| 293 bool pause_on_start: false, | 293 bool pause_on_start: false, |
| 294 bool pause_on_exit: false, | 294 bool pause_on_exit: false, |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 mainArgs: mainArgs, | 454 mainArgs: mainArgs, |
| 455 vmTests: tests, | 455 vmTests: tests, |
| 456 pause_on_start: pause_on_start, | 456 pause_on_start: pause_on_start, |
| 457 pause_on_exit: pause_on_exit, | 457 pause_on_exit: pause_on_exit, |
| 458 trace_service: trace_service, | 458 trace_service: trace_service, |
| 459 trace_compiler: trace_compiler, | 459 trace_compiler: trace_compiler, |
| 460 verbose_vm: verbose_vm, | 460 verbose_vm: verbose_vm, |
| 461 pause_on_unhandled_exceptions: pause_on_unhandled_exceptions); | 461 pause_on_unhandled_exceptions: pause_on_unhandled_exceptions); |
| 462 } | 462 } |
| 463 } | 463 } |
| OLD | NEW |