| Index: tests/compiler/dart2js/memory_compiler.dart
|
| diff --git a/tests/compiler/dart2js/memory_compiler.dart b/tests/compiler/dart2js/memory_compiler.dart
|
| index c33e7f0d0955a1fcf0635b2252c91b6292d2d8b9..1035d1a1ab11bf14dd497b09547cbc04bef00bd8 100644
|
| --- a/tests/compiler/dart2js/memory_compiler.dart
|
| +++ b/tests/compiler/dart2js/memory_compiler.dart
|
| @@ -4,11 +4,11 @@
|
|
|
| library dart2js.test.memory_compiler;
|
|
|
| -import 'package:expect/expect.dart';
|
| import 'memory_source_file_helper.dart';
|
|
|
| import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
|
| show NullSink;
|
| +import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
|
|
|
| import '../../../sdk/lib/_internal/compiler/compiler.dart'
|
| show Diagnostic, DiagnosticHandler;
|
| @@ -81,10 +81,14 @@ Compiler compilerFor(Map<String,String> memorySourceFiles,
|
| {DiagnosticHandler diagnosticHandler,
|
| List<String> options: const [],
|
| Compiler cachedCompiler,
|
| - bool showDiagnostics: true}) {
|
| + bool showDiagnostics: true,
|
| + Uri packageRoot}) {
|
| Uri script = currentDirectory.resolveUri(Platform.script);
|
| Uri libraryRoot = script.resolve('../../../sdk/');
|
| - Uri packageRoot = currentDirectory.resolve('${Platform.packageRoot}/');
|
| + if (packageRoot == null) {
|
| + packageRoot = currentDirectory.resolve(
|
| + appendSlash(nativeToUriPath(Platform.packageRoot)));
|
| + }
|
|
|
| MemorySourceFileProvider provider;
|
| var readStringFromUri;
|
|
|