Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart

Issue 657673002: Regenerate pub sources. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
diff --git a/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart b/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
index 9d39e351350292d359549c1be8df36d33421c50b..1c17de5fce64dd5fb0b15cf33ea7afa49ca239bd 100644
--- a/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
+++ b/sdk/lib/_internal/pub_generated/test/dart2js/reports_dart_parse_errors_test.dart
@@ -1,13 +1,22 @@
+// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
import 'package:path/path.dart' as p;
import 'package:scheduled_test/scheduled_test.dart';
import 'package:scheduled_test/scheduled_stream.dart';
+
import '../../lib/src/exit_codes.dart' as exit_codes;
import '../descriptor.dart' as d;
import '../test_pub.dart';
+
main() {
initConfig();
integration("reports Dart parse errors", () {
+ // Dart2js can take a long time to compile dart code, so we increase the
+ // timeout to cope with that.
currentSchedule.timeout *= 3;
+
d.dir(
appPath,
[
@@ -18,9 +27,11 @@ main() {
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") + ":")]));
@@ -29,11 +40,17 @@ main() {
[
"[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.shouldExit(exit_codes.DATA);
+
+ // Doesn't output anything if an error occurred.
d.dir(appPath, [d.dir('build', [d.nothing('web')])]).validate();
});
}

Powered by Google App Engine
This is Rietveld 408576698