| Index: sdk/lib/_internal/pub_generated/test/serve_packages.dart
|
| diff --git a/sdk/lib/_internal/pub_generated/test/serve_packages.dart b/sdk/lib/_internal/pub_generated/test/serve_packages.dart
|
| index 0b98cf7dd4430529b3cfefb9da29b3dfcf672f91..2fad96dded98a5c2277e9297b17f6c8a1b46167b 100644
|
| --- a/sdk/lib/_internal/pub_generated/test/serve_packages.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/serve_packages.dart
|
| @@ -148,8 +148,9 @@ class PackageServerBuilder {
|
| if (_packages.containsKey(name)) return;
|
| _packages[name] = [];
|
|
|
| - var pubspec = new Map.from(
|
| - loadYaml(readTextFile(p.join(repoRoot, 'pkg', name, 'pubspec.yaml'))));
|
| + var root = packagePath(name);
|
| + var pubspec =
|
| + new Map.from(loadYaml(readTextFile(p.join(root, 'pubspec.yaml'))));
|
|
|
| // Remove any SDK constraints since we don't have a valid SDK version
|
| // while testing.
|
| @@ -160,9 +161,7 @@ class PackageServerBuilder {
|
| pubspec,
|
| [
|
| d.file('pubspec.yaml', yaml(pubspec)),
|
| - new d.DirectoryDescriptor.fromFilesystem(
|
| - 'lib',
|
| - p.join(repoRoot, 'pkg', name, 'lib'))]));
|
| + new d.DirectoryDescriptor.fromFilesystem('lib', p.join(root, 'lib'))]));
|
|
|
| if (pubspec.containsKey('dependencies')) {
|
| pubspec['dependencies'].keys.forEach(_addPackage);
|
|
|