| Index: sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/dart2js/reports_dart_parse_errors_test.dart b/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
|
| similarity index 56%
|
| copy from sdk/lib/_internal/pub/test/dart2js/reports_dart_parse_errors_test.dart
|
| copy to sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
|
| index 0821b8652b7ceee32bf71fbd11844dde8a29bfb3..1c17de5fce64dd5fb0b15cf33ea7afa49ca239bd 100644
|
| --- a/sdk/lib/_internal/pub/test/dart2js/reports_dart_parse_errors_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
|
| @@ -17,43 +17,40 @@ main() {
|
| // timeout to cope with that.
|
| currentSchedule.timeout *= 3;
|
|
|
| - d.dir(appPath, [
|
| - d.appPubspec(),
|
| - d.dir('web', [
|
| - d.file('file.txt', 'contents'),
|
| - d.file('file.dart', 'void void;'),
|
| - d.dir('subdir', [
|
| - d.file('subfile.dart', 'void void;')
|
| - ])
|
| - ])
|
| - ]).create();
|
| + d.dir(
|
| + appPath,
|
| + [
|
| + d.appPubspec(),
|
| + d.dir(
|
| + 'web',
|
| + [
|
| + d.file('file.txt', 'contents'),
|
| + d.file('file.dart', 'void void;'),
|
| + d.dir('subdir', [d.file('subfile.dart', 'void void;')])])]).create();
|
|
|
| var pub = startPub(args: ["build"]);
|
| pub.stdout.expect(startsWith("Loading source assets..."));
|
| pub.stdout.expect(startsWith("Building myapp..."));
|
|
|
| - var consumeFile = consumeThrough(inOrder([
|
| - "[Error from Dart2JS]:",
|
| - startsWith(p.join("web", "file.dart") + ":")
|
| - ]));
|
| - var consumeSubfile = consumeThrough(inOrder([
|
| - "[Error from Dart2JS]:",
|
| - startsWith(p.join("web", "subdir", "subfile.dart") + ":")
|
| - ]));
|
| + var consumeFile = consumeThrough(
|
| + inOrder(
|
| + ["[Error from Dart2JS]:", startsWith(p.join("web", "file.dart") + ":")]));
|
| + var consumeSubfile = consumeThrough(
|
| + inOrder(
|
| + [
|
| + "[Error from Dart2JS]:",
|
| + startsWith(p.join("web", "subdir", "subfile.dart") + ":")]));
|
|
|
| // It's nondeterministic what order the dart2js transformers start running,
|
| // so we allow the error messages to be emitted in either order.
|
| - pub.stderr.expect(either(
|
| - inOrder([consumeFile, consumeSubfile]),
|
| - inOrder([consumeSubfile, consumeFile])));
|
| + pub.stderr.expect(
|
| + either(
|
| + inOrder([consumeFile, consumeSubfile]),
|
| + inOrder([consumeSubfile, consumeFile])));
|
|
|
| pub.shouldExit(exit_codes.DATA);
|
|
|
| // Doesn't output anything if an error occurred.
|
| - d.dir(appPath, [
|
| - d.dir('build', [
|
| - d.nothing('web')
|
| - ])
|
| - ]).validate();
|
| + d.dir(appPath, [d.dir('build', [d.nothing('web')])]).validate();
|
| });
|
| }
|
|
|