Version 1.2.0-dev.2.1
svn merge -r 32094:32096 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@32099 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/_internal/pub/test/serve/utils.dart b/sdk/lib/_internal/pub/test/serve/utils.dart
index 43f1966..0394803 100644
--- a/sdk/lib/_internal/pub/test/serve/utils.dart
+++ b/sdk/lib/_internal/pub/test/serve/utils.dart
@@ -106,7 +106,7 @@
// Dart2js can take a long time to compile dart code, so we increase the
// timeout to cope with that.
- currentSchedule.timeout = new Duration(seconds: 15);
+ currentSchedule.timeout *= 1.5;
return startPub(args: pubArgs);
}
diff --git a/sdk/lib/_internal/pub/test/transformer/dart2js/converts_isolate_entrypoint_in_web_test.dart b/sdk/lib/_internal/pub/test/transformer/dart2js/converts_isolate_entrypoint_in_web_test.dart
index 2430273..087e9f2 100644
--- a/sdk/lib/_internal/pub/test/transformer/dart2js/converts_isolate_entrypoint_in_web_test.dart
+++ b/sdk/lib/_internal/pub/test/transformer/dart2js/converts_isolate_entrypoint_in_web_test.dart
@@ -13,6 +13,10 @@
main() {
initConfig();
integration("converts a Dart isolate entrypoint in web to JS", () {
+ // Increase the timeout because dart2js takes a lot longer than usual to
+ // compile isolate entrypoints.
+ currentSchedule.timeout *= 2;
+
d.dir(appPath, [
d.appPubspec(),
d.dir("web", [
diff --git a/tools/VERSION b/tools/VERSION
index 71577a9..7e48af8 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 2
PATCH 0
PRERELEASE 2
-PRERELEASE_PATCH 0
+PRERELEASE_PATCH 1
