| Index: pkg/testing/lib/src/discover.dart
|
| diff --git a/pkg/testing/lib/src/discover.dart b/pkg/testing/lib/src/discover.dart
|
| index 219594771b24d36d3db8a1b2cbe10661925776f9..14d8ead32fe985c470b8d99d0ee53ee2f99cd0e4 100644
|
| --- a/pkg/testing/lib/src/discover.dart
|
| +++ b/pkg/testing/lib/src/discover.dart
|
| @@ -4,20 +4,11 @@
|
|
|
| library testing.discover;
|
|
|
| -import 'dart:io' show
|
| - Directory,
|
| - FileSystemEntity,
|
| - Platform,
|
| - Process;
|
| +import 'dart:io' show Directory, FileSystemEntity, Platform, Process;
|
|
|
| -import 'dart:async' show
|
| - Future,
|
| - Stream,
|
| - StreamController,
|
| - StreamSubscription;
|
| +import 'dart:async' show Future, Stream, StreamController, StreamSubscription;
|
|
|
| -import '../testing.dart' show
|
| - TestDescription;
|
| +import '../testing.dart' show TestDescription;
|
|
|
| final Uri packageConfig = computePackageConfig();
|
|
|
| @@ -72,8 +63,8 @@ Uri computePackageConfig() {
|
| }
|
|
|
| Uri computeDartSdk() {
|
| - String dartSdkPath = Platform.environment["DART_SDK"]
|
| - ?? const String.fromEnvironment("DART_SDK");
|
| + String dartSdkPath = Platform.environment["DART_SDK"] ??
|
| + const String.fromEnvironment("DART_SDK");
|
| if (dartSdkPath != null) {
|
| return Uri.base.resolveUri(new Uri.file(dartSdkPath));
|
| } else {
|
| @@ -81,10 +72,8 @@ Uri computeDartSdk() {
|
| }
|
| }
|
|
|
| -Future<Process> startDart(
|
| - Uri program,
|
| - [List<String> arguments,
|
| - List<String> vmArguments]) {
|
| +Future<Process> startDart(Uri program,
|
| + [List<String> arguments, List<String> vmArguments]) {
|
| List<String> allArguments = <String>[];
|
| allArguments.addAll(vmArguments ?? dartArguments);
|
| allArguments.add(program.toFilePath());
|
|
|