| Index: tests/isolate/package_root_test.dart
|
| diff --git a/tests/isolate/package_root_test.dart b/tests/isolate/package_root_test.dart
|
| index 2ee6b30aa36ae2afb7c33a1ea47423c439bb8bc1..a17bce753903a125d1071ed0005b1b40f40a4e83 100644
|
| --- a/tests/isolate/package_root_test.dart
|
| +++ b/tests/isolate/package_root_test.dart
|
| @@ -5,32 +5,27 @@
|
| import 'dart:io';
|
| import 'dart:isolate';
|
|
|
| -final SPAWN_PACKAGE_ROOT = Uri.parse("otherPackageRoot");
|
| +final SPAWN_PACKAGE_ROOT = "file:///no/such/file/";
|
|
|
| void main([args, port]) {
|
| if (port != null) {
|
| - testPackageRoot(args);
|
| + testPackageRoot(port);
|
| return;
|
| }
|
| - var p = new ReceivePort();
|
| + var p = new RawReceivePort();
|
| Isolate.spawnUri(Platform.script,
|
| - [p.sendPort, Platform.packageRoot],
|
| - {},
|
| - packageRoot: SPAWN_PACKAGE_ROOT);
|
| - p.listen((msg) {
|
| + [],
|
| + p.sendPort,
|
| + packageRoot: Uri.parse(SPAWN_PACKAGE_ROOT));
|
| + p.handler = (msg) {
|
| p.close();
|
| - });
|
| + if (msg != SPAWN_PACKAGE_ROOT) {
|
| + throw "Bad package root in child isolate: $msg";
|
| + }
|
| + };
|
| }
|
|
|
| -
|
| -void testPackageRoot(args) {
|
| - var parentPackageRoot = args[1];
|
| - if (parentPackageRoot == Platform.packageRoot) {
|
| - throw "Got parent package root";
|
| - }
|
| - if (Uri.parse(Platform.packageRoot) != SPAWN_PACKAGE_ROOT) {
|
| - throw "Wrong package root";
|
| - }
|
| - args[0].send(null);
|
| +testPackageRoot(port) async {
|
| + var packageRoot = await Isolate.packageRoot;
|
| + port.send(packageRoot.toString());
|
| }
|
| -
|
|
|