| Index: tests/compiler/dart2js/launch_helper.dart
|
| diff --git a/tests/compiler/dart2js/launch_helper.dart b/tests/compiler/dart2js/launch_helper.dart
|
| index 4a27cf70a87160068ab1a8c157a63dacb79efd94..671d4121af7a11d9d41be5ec0de4155fe0a1eea4 100644
|
| --- a/tests/compiler/dart2js/launch_helper.dart
|
| +++ b/tests/compiler/dart2js/launch_helper.dart
|
| @@ -2,26 +2,29 @@ import 'dart:async';
|
| import 'dart:io';
|
| import 'package:path/path.dart' as path;
|
|
|
| -Future launchDart2Js(args,
|
| - {bool noStdoutEncoding: false}) {
|
| +List<String> dart2JsCommand(List<String> args) {
|
| String basePath = path.fromUri(Platform.script);
|
| while (path.basename(basePath) != 'sdk') {
|
| basePath = path.dirname(basePath);
|
| }
|
| - String dart2jsPath = path.normalize(
|
| - path.join(basePath, 'pkg/compiler/lib/src/dart2js.dart'));
|
| - List allArgs = [];
|
| + String dart2jsPath =
|
| + path.normalize(path.join(basePath, 'pkg/compiler/lib/src/dart2js.dart'));
|
| + List command = <String>[];
|
| if (Platform.packageRoot != null) {
|
| - allArgs.add('--package-root=${Platform.packageRoot}');
|
| + command.add('--package-root=${Platform.packageRoot}');
|
| } else if (Platform.packageConfig != null) {
|
| - allArgs.add('--packages=${Platform.packageConfig}');
|
| + command.add('--packages=${Platform.packageConfig}');
|
| }
|
| - allArgs.add(dart2jsPath);
|
| - allArgs.addAll(args);
|
| + command.add(dart2jsPath);
|
| + command.addAll(args);
|
| + return command;
|
| +}
|
| +
|
| +Future launchDart2Js(args, {bool noStdoutEncoding: false}) {
|
| if (noStdoutEncoding) {
|
| - return Process.run(Platform.executable, allArgs, stdoutEncoding: null);
|
| + return Process.run(Platform.executable, dart2JsCommand(args),
|
| + stdoutEncoding: null);
|
| } else {
|
| - return Process.run(Platform.executable, allArgs);
|
| + return Process.run(Platform.executable, dart2JsCommand(args));
|
| }
|
| }
|
| -
|
|
|