| Index: tools/testing/dart/test_runner.dart
|
| diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart
|
| index 23c37b2a60ca6cf28ef51ae97476e3c28286ce5d..8b1cc55887bdbf40eaaffdc968f0e81169496c45 100644
|
| --- a/tools/testing/dart/test_runner.dart
|
| +++ b/tools/testing/dart/test_runner.dart
|
| @@ -1964,6 +1964,8 @@ class BatchRunnerProcess {
|
| });
|
| };
|
| _process.kill();
|
| + _stdoutSubscription.cancel();
|
| + _stderrSubscription.cancel();
|
| } else {
|
| doStartTest(command, timeout);
|
| }
|
| @@ -1973,12 +1975,12 @@ class BatchRunnerProcess {
|
| Future terminate() {
|
| if (_process == null) return new Future.value(true);
|
| Completer terminateCompleter = new Completer();
|
| - Timer killTimer;
|
| _processExitHandler = (_) {
|
| - if (killTimer != null) killTimer.cancel();
|
| terminateCompleter.complete(true);
|
| };
|
| _process.kill();
|
| + _stdoutSubscription.cancel();
|
| + _stderrSubscription.cancel();
|
|
|
| return terminateCompleter.future;
|
| }
|
|
|