| Index: sdk/lib/_internal/pub/test/install/pub_install_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/install/pub_install_test.dart b/sdk/lib/_internal/pub/test/install/pub_install_test.dart
|
| index a20f26ef233d669e709b1c1c143df12a5293c776..866376b8c1c2d4263066677d009c2a952308fc35 100644
|
| --- a/sdk/lib/_internal/pub/test/install/pub_install_test.dart
|
| +++ b/sdk/lib/_internal/pub/test/install/pub_install_test.dart
|
| @@ -173,117 +173,35 @@ main() {
|
| });
|
|
|
| group('creates a packages directory in', () {
|
| - integration('"test/" and its subdirectories', () {
|
| - d.dir(appPath, [
|
| - d.appPubspec([]),
|
| - d.libDir('foo'),
|
| - d.dir("test", [d.dir("subtest")])
|
| - ]).create();
|
| -
|
| - schedulePub(args: ['install'],
|
| - output: new RegExp(r"Dependencies installed!$"));
|
| -
|
| - d.dir(appPath, [
|
| - d.dir("test", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ]),
|
| - d.dir("subtest", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ])
|
| - ])
|
| - ])
|
| - ]).validate();
|
| - });
|
| -
|
| - integration('"example/" and its subdirectories', () {
|
| - d.dir(appPath, [
|
| - d.appPubspec([]),
|
| - d.libDir('foo'),
|
| - d.dir("example", [d.dir("subexample")])
|
| - ]).create();
|
| -
|
| - schedulePub(args: ['install'],
|
| - output: new RegExp(r"Dependencies installed!$"));
|
| -
|
| - d.dir(appPath, [
|
| - d.dir("example", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ]),
|
| - d.dir("subexample", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ])
|
| - ])
|
| - ])
|
| - ]).validate();
|
| - });
|
| -
|
| - integration('"tool/" and its subdirectories', () {
|
| - d.dir(appPath, [
|
| - d.appPubspec([]),
|
| - d.libDir('foo'),
|
| - d.dir("tool", [d.dir("subtool")])
|
| - ]).create();
|
| -
|
| - schedulePub(args: ['install'],
|
| - output: new RegExp(r"Dependencies installed!$"));
|
| -
|
| - d.dir(appPath, [
|
| - d.dir("tool", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ]),
|
| - d.dir("subtool", [
|
| + for (var dir in ["benchmark", "example", "test", "tool", "web"]) {
|
| + integration('"$dir/" and its subdirectories', () {
|
| + d.dir(appPath, [
|
| + d.appPubspec([]),
|
| + d.libDir('foo'),
|
| + d.dir(dir, [d.dir("sub${dir}")])
|
| + ]).create();
|
| +
|
| + schedulePub(args: ['install'],
|
| + output: new RegExp(r"Dependencies installed!$"));
|
| +
|
| + d.dir(appPath, [
|
| + d.dir(dir, [
|
| d.dir("packages", [
|
| d.dir("myapp", [
|
| d.file('foo.dart', 'main() => "foo";')
|
| ])
|
| - ])
|
| - ])
|
| - ])
|
| - ]).validate();
|
| - });
|
| -
|
| - integration('"web/" and its subdirectories', () {
|
| - d.dir(appPath, [
|
| - d.appPubspec([]),
|
| - d.libDir('foo'),
|
| - d.dir("web", [d.dir("subweb")])
|
| - ]).create();
|
| -
|
| - schedulePub(args: ['install'],
|
| - output: new RegExp(r"Dependencies installed!$"));
|
| -
|
| - d.dir(appPath, [
|
| - d.dir("web", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| - ])
|
| - ]),
|
| - d.dir("subweb", [
|
| - d.dir("packages", [
|
| - d.dir("myapp", [
|
| - d.file('foo.dart', 'main() => "foo";')
|
| + ]),
|
| + d.dir("sub${dir}", [
|
| + d.dir("packages", [
|
| + d.dir("myapp", [
|
| + d.file('foo.dart', 'main() => "foo";')
|
| + ])
|
| ])
|
| ])
|
| ])
|
| - ])
|
| - ]).validate();
|
| - });
|
| + ]).validate();
|
| + });
|
| + }
|
|
|
| integration('"bin/"', () {
|
| d.dir(appPath, [
|
|
|